[hdparm/f19: 4/4] Merge branch 'master' into f19

[Michal Minar]

commit 74797372f8a32af59d104976409985a19192fe83
Merge: eb34dc7 aec60e8
Author: Michal Minar <miminar at redhat.com>
Date:   Sun Jul 21 14:06:47 2013 +0200

    Merge branch 'master' into f19
    
    Conflicts:
    	hdparm.spec

 hdparm-9.43-close_fd.patch        |   12 +++++++++
 hdparm-9.43-ditch_dead_code.patch |   47 +++++++++++++++++++++++++++++++++++++
 hdparm-missing-params.patch       |   12 +++++++++
 hdparm.spec                       |   16 +++++++++++-
 man-page-update.patch             |   14 +++++++++++
 5 files changed, 100 insertions(+), 1 deletions(-)
---