Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcous...
authorTony Lindgren <tony@atomide.com>
Fri, 17 Feb 2012 23:12:36 +0000 (15:12 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 17 Feb 2012 23:12:36 +0000 (15:12 -0800)
commit4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4
tree72e500b97c4bdcb9631209f3121f42b05ae30fea
parent40c0591f0a349ec074357e05c6ab1a3bc951807c
parent19bfb76ca32f8e4fa80746608ff4a77707f40520
Merge branch 'for_3.4/dt_base' of git://git./linux/kernel/git/bcousson/linux-omap-dt into dt
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-omap/Kconfig