git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d9e9dbd d23f559)
Merge branch 'sram-map-io' into dt-merge
authorTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 02:09:23 +0000 (19:09 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 6 Oct 2011 02:09:23 +0000 (19:09 -0700)
Conflicts:
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c


Trivial merge
Pandora Kernel Repository