[mdadm/f17: 2/2] Merge branch 'master' into f17

[Jes Sorensen]

commit a7f3d7faeb8e4b6d21f44826579059fd2b7976d9
Merge: 00654b0 5fca48b
Author: Jes Sorensen <Jes.Sorensen at redhat.com>
Date:   Thu Oct 25 11:04:16 2012 +0200

    Merge branch 'master' into f17

 .gitignore                                       |    1 +
 mdadm-3.2.3-udev.patch => mdadm-3.2.6-udev.patch |    4 ++--
 mdadm.spec                                       |   16 +++++++---------
 sources                                          |    3 +--
 4 files changed, 11 insertions(+), 13 deletions(-)
---