From: Michael Tremer Date: Mon, 16 Mar 2015 16:50:34 +0000 (+0100) Subject: Merge remote-tracking branch 'mfischer/acpid' into next X-Git-Tag: v2.17-core91~154^2~3^2~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3db2633165c196c0ae4537199596201b940e71eb;p=ipfire-2.x.git Merge remote-tracking branch 'mfischer/acpid' into next --- 3db2633165c196c0ae4537199596201b940e71eb