git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: eddecbb b295d6e)

author	Paul Mundt <lethal@linux-sh.org>
	Tue, 22 Mar 2011 05:27:36 +0000 (14:27 +0900)
committer	Paul Mundt <lethal@linux-sh.org>
	Tue, 22 Mar 2011 05:27:36 +0000 (14:27 +0900)
commit	da49252fb0392d8196833ef3da92e48fb371f8d7
tree	1299899f7513a900b2229b8cde289bca8c41d2f5	tree \| snapshot
parent	eddecbb601c9ea3fab7e67d7892010fc9426d1e6	commit \| diff
parent	b295d6e593e02168fdafc5db11464b6d51cf239d	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-3430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-4430sdp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-cm-t35.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-devkit8000.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-igep0020.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3beagle.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3evm.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3pandora.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap3stalker.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-omap4panda.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/board-overo.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock2420_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock2430_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock3xxx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/clock44xx_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_2420_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_2430_data.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-omap2/omap_hwmod_3xxx_data.c	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git