Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
authorPaul Mundt <lethal@linux-sh.org>
Tue, 22 Mar 2011 05:27:36 +0000 (14:27 +0900)
committerPaul Mundt <lethal@linux-sh.org>
Tue, 22 Mar 2011 05:27:36 +0000 (14:27 +0900)
commitda49252fb0392d8196833ef3da92e48fb371f8d7
tree1299899f7513a900b2229b8cde289bca8c41d2f5
parenteddecbb601c9ea3fab7e67d7892010fc9426d1e6
parentb295d6e593e02168fdafc5db11464b6d51cf239d
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

Conflicts:
arch/arm/mach-omap2/board-overo.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
19 files changed:
MAINTAINERS
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-cm-t35.c
arch/arm/mach-omap2/board-devkit8000.c
arch/arm/mach-omap2/board-igep0020.c
arch/arm/mach-omap2/board-omap3beagle.c
arch/arm/mach-omap2/board-omap3evm.c
arch/arm/mach-omap2/board-omap3pandora.c
arch/arm/mach-omap2/board-omap3stalker.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/board-overo.c
arch/arm/mach-omap2/clock2420_data.c
arch/arm/mach-omap2/clock2430_data.c
arch/arm/mach-omap2/clock3xxx_data.c
arch/arm/mach-omap2/clock44xx_data.c
arch/arm/mach-omap2/omap_hwmod_2420_data.c
arch/arm/mach-omap2/omap_hwmod_2430_data.c
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c