]> git.karo-electronics.de Git - karo-tx-linux.git/commit
projects / karo-tx-linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: aac10aa 69964ea)
Merge 3.4-rc5 into driver-core-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 May 2012 21:33:37 +0000 (14:33 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 2 May 2012 21:33:37 +0000 (14:33 -0700)
commiteb1574270a6de8fb8d31ffc3b021e30df0afcda3
treed154ba369f222f5108ed1a2462d815d7faadc2e5tree | snapshot
parentaac10aaa8cc65a6fef6f5bc7d0b96035b0225a61commit | diff
parent69964ea4c7b68c9399f7977aa5b9aa6539a6a98acommit | diff
Merge 3.4-rc5 into driver-core-next

This was done to resolve a merge issue with the init/main.c file.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Documentation/feature-removal-schedule.txt diff1 | diff2 | blob | history
drivers/staging/android/Kconfig diff1 | diff2 | blob | history
init/main.c diff1 | diff2 | blob | history
lib/kobject.c diff1 | diff2 | blob | history
Linux kernel for KaRo TX COM modules