projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cde9efe a58154d)
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 patch | diff1 | diff2 | blob | history
drivers/dma/imx-sdma.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc drivers/dma/imx-sdma.c
Simple merge
Domain: System / Uncategorized;