Merge remote-tracking branch 'mfischer/hdparm' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:22:01 +0000 (17:22 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 2 Dec 2014 16:22:01 +0000 (17:22 +0100)
commitd3b375fc1e653ad00e37efb8b5626d10589f4056
tree2dd22e4613a06de719b4784e4979706f431c315b
parent487d0477f7fb7be8c869aa891f15896537822276
parent068babfb1377c930a80c1b7baf75c97661a2481c
Merge remote-tracking branch 'mfischer/hdparm' into next