]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'acpi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Fri, 3 Aug 2012 01:17:45 +0000 (11:17 +1000)
committerStephen Rothwell <sfr@canb.auug.org.au>
Fri, 3 Aug 2012 01:17:45 +0000 (11:17 +1000)

Trivial merge