Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 25 Feb 2010 20:41:34 +0000 (20:41 +0000)
commit2a2d10f386c1bacabe1a530c06dc8488eac419e5
tree4606a4a3bafa42a8aa70e001d35883956a0f0589
parent2f68ffd11aa76b251921976c982b814df9ebe890
parentc499546f43f2c31b681271ef7db922839fcde5fe
Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable
arch/arm/mach-kirkwood/Kconfig
arch/arm/mach-kirkwood/Makefile