projects / platform / upstream / kernel-adaptation-pc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9326845 59bdd13)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Dec 2010 22:46:24 +0000 (22:46 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Dec 2010 22:46:24 +0000 (22:46 +0000)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/kernel/Makefile patch | diff1 | diff2 | blob | history
arch/arm/kernel/entry-armv.S patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/kernel/Makefile
Simple merge
diff --cc arch/arm/kernel/entry-armv.S
Simple merge
Domain: System / Uncategorized;