Merge branch 'next-s3c64xx-device' into next-merged
authorBen Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 16:17:37 +0000 (16:17 +0000)
committerBen Dooks <ben-linux@fluff.org>
Thu, 18 Dec 2008 16:17:37 +0000 (16:17 +0000)
commit56c035c9ce1f1850969778af6a4cc0b99089b6c8
treeb6f1998be0c1e6bb623a0c55e8ba04d74bb58cf2
parent7f2754378f3522a42daafdbb9d2385f341008454
parent438a5d42e052ec6126c5f1e24763b711210db33e
Merge branch 'next-s3c64xx-device' into next-merged

Conflicts:

arch/arm/mach-s3c2440/mach-at2440evb.c
arch/arm/mach-s3c2412/mach-jive.c
arch/arm/mach-s3c2440/mach-anubis.c
arch/arm/mach-s3c2440/mach-at2440evb.c
arch/arm/mach-s3c6410/mach-smdk6410.c
arch/arm/plat-s3c/Kconfig
arch/arm/plat-s3c24xx/Makefile
arch/arm/plat-s3c24xx/devs.c