]> git.karo-electronics.de Git - karo-tx-linux.git/commit
Merge remote-tracking branch 'acpi/next'
authorStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:48:15 +0000 (10:48 +1100)
committerStephen Rothwell <sfr@canb.auug.org.au>
Sun, 7 Oct 2012 23:48:15 +0000 (10:48 +1100)
commitbaf6cbc93ee2ba25ccce3df8d71702fb48299aac
tree4cd0f89fe68ae417596b2104451bb97f6cf86918
parentffaf3465ae78c2c2967c2aa0fd1ad4e1808978da
parent558dc6f9ee2a6c686c80b9cdf3426858d2b8dbd1
Merge remote-tracking branch 'acpi/next'

Conflicts:
include/acpi/acpixf.h