tree 1299899f7513a900b2229b8cde289bca8c41d2f5
parent eddecbb601c9ea3fab7e67d7892010fc9426d1e6
parent b295d6e593e02168fdafc5db11464b6d51cf239d
author Paul Mundt <lethal@linux-sh.org> 1300771656 +0900
committer Paul Mundt <lethal@linux-sh.org> 1300771656 +0900

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>