Merge branch 'devel-dma' into omap-for-linus
authorTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 00:48:20 +0000 (16:48 -0800)
committerTony Lindgren <tony@atomide.com>
Wed, 22 Dec 2010 00:48:20 +0000 (16:48 -0800)
1  2 
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/omap_hwmod_2430_data.c

Simple merge