From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 3 Mar 2012 17:30:47 +0000 (+0100)
Subject: Merge remote-tracking branch 'stevee/hdparm'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=29913e4d5a74fdc4a2ff8c5960d49f16e178b8bb;p=ipfire-3.x.git

Merge remote-tracking branch 'stevee/hdparm'
---

29913e4d5a74fdc4a2ff8c5960d49f16e178b8bb