Merge remote-tracking branch 'mfischer/acpid' into next
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:50:34 +0000 (17:50 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 16 Mar 2015 16:50:34 +0000 (17:50 +0100)
commit3db2633165c196c0ae4537199596201b940e71eb
treed73b36b01e742c56b1d72ea96e2633d41e05c8f6
parent53103ab55c63eda3cd302c9b8af743429b62726c
parent8996f5a3bb3f6daa9df6190042bb0927d5f5b470
Merge remote-tracking branch 'mfischer/acpid' into next