]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
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)
Conflicts:
arch/arm/mach-omap2/board-overo.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

No differences found