tree f71e3f05420f35f7eaf838d93fb83d665aedcac4
parent 3d4db84cee590dbf5b5fa49d8bcd9e1c60f2a4b5
parent 1a71e4ade19d51bab03b6837d4d33a953e4e1206
author Ben Dooks <ben-linux@fluff.org> 1259875981 +0000
committer Ben Dooks <ben-linux@fluff.org> 1259875981 +0000

ARM: Merge next-s3c24xx-dev-rtp

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

Conflicts:

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