]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commitf1152c3a17830a4ce7b2a9c3bd59ab542ab02feb
treec2477d2ba16de509ad546ec1ba24c21764a70292
parentbaa9951754f51011e9b42bd5554771334ff082a9
parent558dc6f9ee2a6c686c80b9cdf3426858d2b8dbd1
Merge remote-tracking branch 'acpi/next'

Conflicts:
include/acpi/acpixf.h