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)
Merge branch 'next-s3c24xx-dev-rtp' into for-rmk

Conflicts:

arch/arm/mach-s3c2440/mach-anubis.c


Trivial merge