Ben Dooks 7f0ff702cd ARM: Merge next-samsung-s3c64xx-platdeletion ...

Merge branch 'next-samsung-s3c64xx-platdeletion' into next-samsung

Conflicts:

	arch/arm/mach-s3c64xx/Makefile (fixed)

2010-02-22 23:38:26 +00:00

..

include/mach

ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440

2010-02-01 17:55:25 +00:00

clock.c

ARM: SAMSUNG: Reduce size of struct clk.

2010-01-15 17:10:10 +09:00

dma.c

ARM: SAMSUNG: Remove dma-plat.h to allow plat-s3c64xx to be removed

2010-02-21 23:10:35 +00:00

dsc.c

ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h

2010-02-01 17:56:46 +00:00

irq.c

ARM: S3C: Update Simtec copyright statements from , to -

2009-12-01 01:33:51 +00:00

Kconfig

ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440

2010-02-01 17:56:04 +00:00

mach-anubis.c

ARM: S3C: Rename s3c_device_usb to s3c_device_ohci

2010-01-15 19:33:19 +09:00

mach-at2440evb.c

ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata().

2010-01-19 17:21:38 +09:00

mach-gta02.c

ARM: S3C24XX: Merge s3c2442 and s3c2440 machines into mach-s3c2440

2010-02-01 17:55:25 +00:00

mach-mini2440.c

ARM: S3C24XX: Add mci platform data set call s3c24xx_mci_set_platdata().

2010-01-19 17:21:38 +09:00

mach-nexcoder.c

ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h

2010-02-01 17:56:46 +00:00

mach-osiris-dvs.c

ARM: OSIRIS: DVS (Dynamic Voltage Scaling) supoort.

2009-12-01 01:33:49 +00:00

mach-osiris.c

ARM: mach-osiris: add NAND_SCAN_SILENT_NODEV to optional devices

2009-12-23 19:28:11 +00:00

mach-rx3715.c

ARM: S3C: Rename s3c_device_usb to s3c_device_ohci

2010-01-15 19:33:19 +09:00

mach-smdk2440.c

ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h

2010-02-01 17:56:46 +00:00

Makefile

ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440

2010-02-01 17:56:04 +00:00

s3c244x-clock.c

ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440

2010-02-01 17:56:04 +00:00

s3c244x-irq.c

ARM: S3C24XX: Move S3C2440/S3C2442 plat-s3c24xx support to mach-s3c2440

2010-02-01 17:56:04 +00:00

s3c244x.c

ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h

2010-02-01 17:56:46 +00:00

s3c2440.c

ARM: S3C244X: Merge plat-s3c24xx s3c2440.h and s3c2442.h into s3c244x.h

2010-02-01 17:56:46 +00:00

s3c2442.c

ARM: S3C244X: Move S3C2442 code into S3C2440

2010-02-01 17:55:31 +00:00