]> www.infradead.org Git - users/hch/misc.git/commitdiff
projects / users / hch / misc.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5b88128 b9214b9)
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>
Fri, 14 Jan 2011 12:12:42 +0000 (12:12 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 14 Jan 2011 12:12:42 +0000 (12:12 +0000)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/mach-mx5/clock-mx51-mx53.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/mach-mx5/clock-mx51-mx53.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.