Merge branch 'omap-for-v3.8/fixes-for-merge-window' into omap-for-v3.8/fixes-for...
authorTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2012 19:28:10 +0000 (11:28 -0800)
committerTony Lindgren <tony@atomide.com>
Sun, 16 Dec 2012 19:28:10 +0000 (11:28 -0800)
1  2 
arch/arm/boot/dts/Makefile

Simple merge