projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc0b7a2 7bb56d0)
Merge branch 'next-merged' of git://aeryn.fluff.org.uk/bjdooks/linux into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 18 Dec 2008 22:15:30 +0000 (22:15 +0000)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
Simple merge
John Crispins staging tree