]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
git://bbs.cooldavid.org / net-next-2.6.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc4978b 5ccd430)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/nico/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 21 Jul 2010 08:22:45 +0000 (09:22 +0100)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/kernel/entry-armv.S patch | diff1 | diff2 | blob | history
arch/arm/kernel/process.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/entry-armv.S
Simple merge
diff --cc arch/arm/kernel/process.c
Simple merge
Clone of davem's net-next-2.6 tree