]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 14e3820 4eef576)
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)
commit7e131c5b5fe04a8ed6ae1ea70a0f766b110d2ed4
treed154ba369f222f5108ed1a2462d815d7faadc2e5tree | snapshot
parent14e3820b34c163b51ddbc6fcc3e575c433128853commit | diff
parent4eef5766f65daf1741a7f346ba2469bd2c376574commit | 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 Source Tree.