linux/arch/arm/mach-s3c24xx
Arnd Bergmann f4e2467bad Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup
* 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6:
  ep93xx: Remove unnecessary includes of ep93xx-regs.h
  ep93xx: Move EP93XX_SYSCON defines to SoC private header
  ep93xx: Move crunch code to mach-ep93xx directory
  ep93xx: Make syscon access functions private to SoC
  ep93xx: Configure GPIO ports in core code
  ep93xx: Move peripheral defines to local SoC header
  ep93xx: Convert the watchdog driver into a platform device.
  ep93xx: Use ioremap for backlight driver
  ep93xx: Move GPIO defines to gpio-ep93xx.h
  ep93xx: Don't use system controller defines in audio drivers
  ep93xx: Move PHYS_BASE defines to local SoC header file

(update to v3.3-rc7)

Conflicts:
	arch/arm/mach-s3c2440/common.h
2012-03-15 15:20:07 +00:00
..
include/mach Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
bast-ide.c
bast-irq.c
clock-s3c244x.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
clock-s3c2412.c
clock-s3c2416.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
clock-s3c2440.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
clock-s3c2443.c
common-s3c2443.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
common-smdk.c
dma-s3c2410.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
dma-s3c2412.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
dma-s3c2440.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
dma-s3c2443.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
h1940-bluetooth.c
irq-s3c244x.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
irq-s3c2412.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
irq-s3c2416.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
irq-s3c2440.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
irq-s3c2443.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
Kconfig
mach-amlm5900.c
mach-anubis.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-at2440evb.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-bast.c
mach-gta02.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-h1940.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
mach-jive.c
mach-mini2440.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-n30.c
mach-nexcoder.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-osiris-dvs.c
mach-osiris.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-otom.c
mach-qt2410.c
mach-rx1950.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-rx3715.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-smdk2410.c
mach-smdk2413.c
mach-smdk2416.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
mach-smdk2440.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
mach-smdk2443.c
mach-tct_hammer.c
mach-vr1000.c
mach-vstms.c
Makefile
Makefile.boot
pm-h1940.S
pm-s3c2410.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
pm-s3c2412.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
pm-s3c2416.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
s3c244x.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
s3c2410.c
s3c2412.c
s3c2416.c
s3c2440.c Merge branch 'ep93xx-for-arm-soc' of git://github.com/RyanMallon/linux-2.6 into next/cleanup 2012-03-15 15:20:07 +00:00
s3c2442.c Merge branch 'next/cleanup-s3c24xx' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/cleanup 2012-03-08 08:53:14 -08:00
s3c2443.c
setup-i2c.c
setup-sdhci-gpio.c
setup-ts.c
simtec-audio.c
simtec-nor.c
simtec-pm.c
simtec-usb.c
simtec.h
sleep-s3c2410.S
sleep-s3c2412.S