Merge branch 'omap-boards' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:07:23 +0000 (11:07 -0700)
committerTony Lindgren <tony@atomide.com>
Thu, 20 May 2010 18:07:23 +0000 (11:07 -0700)
1  2 
arch/arm/configs/ams_delta_defconfig

Simple merge