git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3bbcf5 d5e1322)
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for...
authorTony Lindgren <tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000 (12:06 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000 (12:06 -0800)
Conflicts:
arch/arm/mach-omap2/board-3430sdp.c

1  2 
arch/arm/mach-omap2/board-3430sdp.c patch | diff1 | diff2 | blob | history
arch/arm/mach-omap2/board-omap3evm.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-omap2/board-3430sdp.c
Simple merge
diff --cc arch/arm/mach-omap2/board-omap3evm.c
Simple merge
Pandora Kernel Repository