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)
commit6971071cdda79cad5f53ba390e466d696e7e9006
treeafa3f33334ac8115caa05a53addea137bcbe9164
parent4584acc3ee236424b5d0b52f143d980cae3c2be5
parentf31cc9622d75c1c6f041d786698daa425c0425c2
Merge branch 'devel-dma' into omap-for-linus
arch/arm/mach-omap2/Makefile
arch/arm/mach-omap2/omap_hwmod_2430_data.c