projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d8d249 ae5c8c8)
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 8 Jun 2009 18:27:13 +0000 (19:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 8 Jun 2009 18:27:13 +0000 (19:27 +0100)
1  2 
MAINTAINERS patch | diff1 | diff2 | blob | history
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-pxa/palmld.c patch | diff1 | diff2 | blob | history

diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-pxa/palmld.c
Simple merge
John Crispins staging tree