]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge remote-tracking branch 'acpi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 00:11:03 +0000 (11:11 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Tue, 9 Oct 2012 00:11:03 +0000 (11:11 +1100)
Conflicts:
include/acpi/acpixf.h


No differences found