Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:33:54 +0000 (17:33 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 4 Dec 2009 17:33:54 +0000 (17:33 +0000)
commit602fd7c36728a04e61a442c9755e7d454501266c
tree6be77464bd07934a40959d68e5d08d75829bdc49
parentd7931d9f7ab9de9158c6905caae979999134ad4d
parent88d27041cf4d36e499e2c54b6c44d9115ccf124a
Merge branch 'for-rmk' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/Kconfig
arch/arm/Makefile