Merge branch 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Wed, 6 Feb 2013 01:01:56 +0000 (17:01 -0800)
committerOlof Johansson <olof@lixom.net>
Wed, 6 Feb 2013 01:01:56 +0000 (17:01 -0800)
commitcf55f672c325f234d96911571a775b2e7d9cf284
tree9242f9ddb0f556dca7884c60ad81aefbe35ae258
parent5060c8881a4b177e27d5bcf351212f2bee125955
parent37c3adca81b282bdf310d5ed54acbc28ac0b20a3
Merge branch 'next/cleanup-s3c24xx-2' of git://git./linux/kernel/git/kgene/linux-samsung into next/cleanup

From Kukjin Kim:
This is 4th cleanup for Samsung S3C24XX stuff, and removes plat-s3c24xx
directory.

* 'next/cleanup-s3c24xx-2' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung:
  ARM: S3C24XX: header mach/regs-mem.h local
  ARM: S3C24XX: header mach/regs-power.h local
  ARM: S3C24XX: header mach/regs-s3c2412-mem.h local
  ARM: S3C24XX: Remove plat-s3c24xx directory in arch/arm/
arch/arm/Kconfig
arch/arm/mach-s3c24xx/mach-anubis.c
arch/arm/mach-s3c24xx/mach-at2440evb.c
arch/arm/mach-s3c24xx/mach-bast.c
arch/arm/mach-s3c24xx/mach-gta02.c
arch/arm/mach-s3c24xx/mach-jive.c
arch/arm/mach-s3c24xx/mach-mini2440.c
arch/arm/mach-s3c24xx/mach-osiris.c