ARM: Merge next-s3c24xx-dev-rtp
authorBen Dooks <ben-linux@fluff.org>
Thu, 3 Dec 2009 21:33:01 +0000 (21:33 +0000)
committerBen Dooks <ben-linux@fluff.org>
Thu, 3 Dec 2009 21:33:01 +0000 (21:33 +0000)
commitf18ea8276bc6b0f8584c442905e9badc2acc8785
treef71e3f05420f35f7eaf838d93fb83d665aedcac4
parent3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5
parent1a71e4ade19d51bab03b6837d4d33a953e4e1206
ARM: Merge next-s3c24xx-dev-rtp

Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2410/mach-bast.c
arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2440/mach-osiris.c
arch/arm/mach-s3c2440/mach-rx3715.c