MERGE-master-patchset-edits
commitff0b5902f29135a782a3bfb68e3429b86669aea4
authormerge <null@invalid>
Fri, 12 Dec 2008 10:49:19 +0000 (12 10:49 +0000)
committerAndy Green <agreen@pads.home.warmcat.com>
Fri, 12 Dec 2008 10:49:19 +0000 (12 10:49 +0000)
tree8e359cbac27ed115c11714240e671fa575687263
parent94d98f227c15db9305b4bc5c01e39f796b78f0e1
MERGE-master-patchset-edits
63 files changed:
Documentation/arm/Samsung-S3C24XX/Suspend.txt
arch/arm/mach-s3c2410/include/mach/gpio-nrs.h [new file with mode: 0644]
arch/arm/mach-s3c2410/include/mach/gpio.h
arch/arm/mach-s3c2410/include/mach/irqs.h
arch/arm/mach-s3c2410/include/mach/regs-gpio.h
arch/arm/mach-s3c2410/mach-h1940.c
arch/arm/mach-s3c2410/mach-qt2410.c
arch/arm/mach-s3c2410/pm.c
arch/arm/mach-s3c2412/mach-jive.c
arch/arm/mach-s3c2412/pm.c
arch/arm/mach-s3c2440/mach-rx3715.c
arch/arm/mach-s3c24a0/include/mach/irqs.h
arch/arm/mach-s3c6400/include/mach/map.h
arch/arm/mach-s3c6400/include/mach/regs-clock.h [copied from arch/arm/plat-s3c64xx/include/plat/regs-sys.h with 52% similarity]
arch/arm/mach-s3c6400/include/mach/system.h
arch/arm/mach-s3c6410/mach-smdk6410.c
arch/arm/plat-s3c/Kconfig
arch/arm/plat-s3c/Makefile
arch/arm/plat-s3c/gpio.c
arch/arm/plat-s3c/include/plat/cpu.h
arch/arm/plat-s3c/include/plat/gpio-core.h
arch/arm/plat-s3c/include/plat/pm.h [new file with mode: 0644]
arch/arm/plat-s3c/include/plat/regs-serial.h
arch/arm/plat-s3c/pm-check.c [new file with mode: 0644]
arch/arm/plat-s3c/pm-gpio.c [new file with mode: 0644]
arch/arm/plat-s3c/pm.c [new file with mode: 0644]
arch/arm/plat-s3c24xx/Makefile
arch/arm/plat-s3c24xx/common-smdk.c
arch/arm/plat-s3c24xx/gpiolib.c
arch/arm/plat-s3c24xx/include/plat/irq.h
arch/arm/plat-s3c24xx/include/plat/map.h
arch/arm/plat-s3c24xx/include/plat/pm-core.h [new file with mode: 0644]
arch/arm/plat-s3c24xx/include/plat/pm.h [deleted file]
arch/arm/plat-s3c24xx/irq-pm.c [new file with mode: 0644]
arch/arm/plat-s3c24xx/irq.c
arch/arm/plat-s3c24xx/pm-simtec.c
arch/arm/plat-s3c24xx/pm.c
arch/arm/plat-s3c24xx/s3c244x.c
arch/arm/plat-s3c24xx/sleep.S
arch/arm/plat-s3c64xx/Makefile
arch/arm/plat-s3c64xx/cpu.c
arch/arm/plat-s3c64xx/gpiolib.c
arch/arm/plat-s3c64xx/include/plat/irqs.h
arch/arm/plat-s3c64xx/include/plat/pm-core.h [new file with mode: 0644]
arch/arm/plat-s3c64xx/include/plat/regs-clock.h
arch/arm/plat-s3c64xx/include/plat/regs-gpio-memport.h [new file with mode: 0644]
arch/arm/plat-s3c64xx/include/plat/regs-gpio.h
arch/arm/plat-s3c64xx/include/plat/regs-modem.h [new file with mode: 0644]
arch/arm/plat-s3c64xx/include/plat/regs-sys.h
arch/arm/plat-s3c64xx/include/plat/regs-syscon-power.h [new file with mode: 0644]
arch/arm/plat-s3c64xx/irq-eint.c
arch/arm/plat-s3c64xx/irq-pm.c [new file with mode: 0644]
arch/arm/plat-s3c64xx/irq.c
arch/arm/plat-s3c64xx/pm.c [new file with mode: 0644]
arch/arm/plat-s3c64xx/s3c6400-clock.c
arch/arm/plat-s3c64xx/sleep.S [new file with mode: 0644]
drivers/misc/Makefile
drivers/misc/smdk6410-sleeptest.c [new file with mode: 0644]
drivers/mmc/host/sdhci-s3c.c
drivers/serial/s3c6400.c
drivers/serial/samsung.c
drivers/serial/samsung.h
drivers/video/s3c-fb.c