Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:40:15 +0000 (23:40 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 2 Mar 2010 23:40:15 +0000 (23:40 +0000)
commit882d01f96bc1909455696aae6eb7ce4df3e908c8
tree06e5789cb33d0547c2497fd4d0327dc9e8614d37
parent64ed28a87a0c075e91c1c5b0fe7d225a6cc6ae39
parentd608c738bb8fb37e5fbfcdef9c566764f2fea086
Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable

Conflicts:
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/Kconfig
arch/arm/Makefile
arch/arm/mach-s3c64xx/mach-hmt.c
drivers/serial/Kconfig