]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ffaf346 558dc6f)
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)
Conflicts:
include/acpi/acpixf.h


Trivial merge
Linux kernel for KaRo TX COM modules