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)
commitdf760137ad3cbfa15ceed42478f81bff01b6e799
treebe939c9d11094858d74141a4c62cb23f477754d8
parent754b8e653412106ff613f4750b197f807fcd8347
parentde997718b64df2f766736f23f8557da450b83a25
Merge branch 'omap-boards' into omap-for-linus
arch/arm/configs/ams_delta_defconfig