]> 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: 7063c88 3c82e22)
Merge branch 'omap_fixes_31' of git://git.pwsan.com/linux-2.6
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Mon, 10 Aug 2009 13:24:18 +0000 (14:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 10 Aug 2009 13:24:18 +0000 (14:24 +0100)
1  2 
arch/arm/mach-omap2/board-omap3evm.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-overo.c patch | diff1 | diff2 | blob | history
arch/arm/plat-omap/sram.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge
diff --cc arch/arm/mach-omap2/board-overo.c
Simple merge
diff --cc arch/arm/plat-omap/sram.c
Simple merge
Clone of davem's net-next-2.6 tree