Ben Dooks 6aeaad51aa ARM: Merge for-2635-4/watchdog ...

Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2

Conflicts:
	arch/arm/mach-s3c64xx/mach-smdk6410.c
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6440/include/mach/map.h
	arch/arm/mach-s5p6440/mach-smdk6440.c
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/include/mach/map.h
	arch/arm/mach-s5pv210/mach-smdkv210.c

2010-05-20 19:51:40 +09:00

..

include/plat

ARM: Merge for-2635-4/spi-devs

2010-05-20 19:40:24 +09:00

adc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

clock-clksrc.c

ARM: SAMSUNG: Fix bug in clksrc-clk round_rate call.

2010-01-18 16:00:56 +09:00

clock.c

ARM: SAMSUNG: Add s3c_disable_clocks() and tidy init+disable usage

2010-05-10 11:44:38 +09:00

dev-adc.c

ARM: SAMSUNG: Moving ADC device definition to plat-samsung.

2010-05-18 13:38:44 +09:00

dev-fb.c

ARM: SAMSUNG: Set S3C_FB_MAX_WIN in <plat/fb.h>

2010-05-18 18:46:27 +09:00

dev-hsmmc1.c

ARM: SAMSUNG: Move device definitions in plat-samsung

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

dev-hsmmc2.c

ARM: SAMSUNG: Move device definitions in plat-samsung

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

dev-hsmmc.c

ARM: SAMSUNG: Move device definitions in plat-samsung

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

dev-hwmon.c

ARM: SAMSUNG: Move HWMON from plat-s3c24xx to plat-samsung

2010-05-12 17:43:03 +09:00

dev-i2c0.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dev-i2c1.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dev-i2c2.c

ARM: S5PV210: add common I2C device helpers

2010-05-20 18:21:34 +09:00

dev-nand.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dev-rtc.c

ARM: SAMSUNG: Move RTC device definitions in plat-samsung

2010-05-18 16:44:58 +09:00

dev-ts.c

ARM: SAMSUNG: Move s3c64xx dev-ts.c to plat-samsung and rename configuration

2010-05-19 18:25:30 +09:00

dev-uart.c

ARM: SAMSUNG: Make UART device code common

2010-01-19 09:23:50 +09:00

dev-usb-hsotg.c

ARM: SAMSUNG: Add DMA masks to hsotg device

2010-02-03 01:54:54 +00:00

dev-usb.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

dev-wdt.c

ARM: SAMSUNG: Move WDT device definitions in plat-samsung

2010-05-20 19:44:18 +09:00

dma.c

ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung

2010-02-23 00:03:43 +00:00

gpio-config.c

ARM: SAMSUNG: move driver strength gpio configuration helper to common dir

2010-05-19 18:15:02 +09:00

gpio.c

ARM: SAMSUNG: Add spinlock locking to GPIO banks

2010-05-11 17:45:46 +09:00

gpiolib.c

ARM: SAMSUNG: Staticise gpiolib implementation functions

2010-01-21 13:55:15 +09:00

init.c

ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung

2010-02-23 00:03:43 +00:00

irq-uart.c

ARM: SAMSUNG: Move IRQ UART handling for newer devices to plat-samsung

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

irq-vic-timer.c

ARM: SAMSUNG: Move IRQ VIC timer handling out to common header files

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

Kconfig

ARM: Merge for-2635-4/watchdog

2010-05-20 19:51:40 +09:00

Makefile

ARM: Merge for-2635-4/watchdog

2010-05-20 19:51:40 +09:00

pm-check.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

pm-gpio.c

ARM: SAMSUNG: Fix additional increment when running through gpios

2010-05-18 19:07:05 +09:00

pm.c

ARM: SAMSUNG: Move pm.c to plat-samsung

2010-02-23 00:03:43 +00:00

pwm-clock.c

ARM: SAMSUNG: Move pwm-clock code into plat-samsung

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

pwm.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

s3c-pl330.c

S3C: DMA: Add api driver for PL330

2010-05-18 18:00:12 +09:00

time.c

ARM: SAMSUNG: Move the last build from plat-s3c to plat-samsung

2010-02-23 00:03:43 +00:00