Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:18 +0000 (21:20 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Mon, 15 Feb 2010 21:20:18 +0000 (21:20 +0000)
commit56012808f4d5606e401539f663d92009d964425b
treef3736a97725647393a2db7c95462d857115197ca
parenta814290e17ae314bd614476cffc6119846eca27e
parentb2a731aa5cbca7e0252da75e16de7ae5feb1313a
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable

Conflicts:
arch/arm/Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-s3c6410/mach-hmt.c