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