Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 10:23:38 +0000 (10:23 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 5 Jan 2011 10:23:38 +0000 (10:23 +0000)
1  2 
arch/arm/Kconfig
drivers/dma/imx-sdma.c

Simple merge
Simple merge