Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Nov 2009 17:51:21 +0000 (17:51 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 20 Nov 2009 17:51:21 +0000 (17:51 +0000)
commitef1a68848a968f7347cf7eea24072464059af8f1
treeba249a734bacd59c1129aa7bde167a8702c7f2b4
parent1508c99506b5d57b8892a5d759176000c88c93b6
parent0912e5359f89f303f53fd4874dadab77a4949a8a
Merge branch 'for-rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable

Conflicts:
arch/arm/mach-at91/Kconfig