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)
1  2 
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/board-generic.c
arch/arm/plat-omap/Kconfig

Simple merge
Simple merge
Simple merge