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)
commit0a831cec1b627d2f3f60c6f70a4c649b7caa4fe2
treec2ab5e6d5ff4def2ffafe2cd61ac14aedb5a86e7
parent5b88128fd70dcf0d5d7c0ae7d7849777ff925bde
parentb9214b9780d6897a6892e7c8cc903168d6fef097
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
arch/arm/Kconfig
arch/arm/mach-mx5/clock-mx51-mx53.c