]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'acpica' into test
authorLen Brown <len.brown@intel.com>
Thu, 14 Jul 2011 04:16:48 +0000 (00:16 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 14 Jul 2011 04:16:48 +0000 (00:16 -0400)

Trivial merge