]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for...
authorTony Lindgren <tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000 (12:06 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 23 Feb 2011 20:06:28 +0000 (12:06 -0800)
commit7cab8713b1ed0dab08ad6458f92a40b7ff4be619
tree8c95691ac2b5bdfc85efe417427b5903fa80450c
parentc3bbcf5dc3a0bee9db8f82cd7d10eedf02a3b5f5
parentd5e13227c32f12de3afb2e26a86bc9f3e5aaf7b6
Merge branch 'for-tony' of git://gitorious.org/linux-omap-dss2/linux into omap-for-linus

Conflicts:
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-3430sdp.c
arch/arm/mach-omap2/board-omap3evm.c