]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3f44ea0 ed5062d)
Merge branch 'upstream' into next
authorLen Brown <len.brown@intel.com>
Sun, 7 Oct 2012 03:06:11 +0000 (23:06 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 7 Oct 2012 03:06:11 +0000 (23:06 -0400)
commit558dc6f9ee2a6c686c80b9cdf3426858d2b8dbd1
treeb3688dad0e70368ba2d36645c5bec67e3c0d2111tree | snapshot
parent3f44ea0d1c3835872033a6633135e16f87161202commit | diff
parented5062ddaa71e9f8b2b3aacc264428ce6da93d9ecommit | diff
Merge branch 'upstream' into next

Signed-off-by: Len Brown <len.brown@intel.com>
Conflicts:
drivers/usb/core/usb-acpi.c
removed usb_acpi_check_pld() on main, vs
updated parames to a call it made on old acpica brance

include/acpi/acpixf.h
added a header vs added <> syntax
include/acpi/acpixf.h diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules