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/mach	ARM: SMDK6410: Add Watchdog support for SMDK6410	2010-05-20 19:46:15 +09:00
clock.c	ARM: S3C64XX: Add USB external clock definition	2010-05-18 18:21:59 +09:00
cpu.c
cpufreq.c
dev-audio.c	ARM: S3C64XX: Add AC97 platform resources	2010-02-24 02:01:40 +00:00
dev-spi.c
dev-uart.c
dma.c	S3C: DMA: Change argument of s3c2410_dma_devconfig	2010-05-17 16:43:49 +09:00
gpiolib.c	ARM: SAMSUNG: Add GPIO configuration read calls	2010-05-06 10:27:16 +09:00
irq-eint.c
irq-pm.c
irq.c
Kconfig	ARM: Merge for-2635-4/watchdog	2010-05-20 19:51:40 +09:00
mach-anw6410.c
mach-hmt.c	Merge branch 'for-rmk/samsung5' of git://git.fluff.org/bjdooks/linux into devel-stable	2010-03-02 23:40:15 +00:00
mach-ncp.c
mach-smartq.c	ARM: S3C6410: Add basic support for SmartQ machines	2010-05-20 19:42:15 +09:00
mach-smartq.h	ARM: S3C6410: Add basic support for SmartQ machines	2010-05-20 19:42:15 +09:00
mach-smartq5.c	ARM: S3C6410: Add basic support for SmartQ machines	2010-05-20 19:42:15 +09:00
mach-smartq7.c	ARM: S3C6410: Add basic support for SmartQ machines	2010-05-20 19:42:15 +09:00
mach-smdk6400.c	ARM: SAMSUNG: Remove old email address for ben-linux@fluff.org	2010-05-12 10:06:28 +09:00
mach-smdk6410.c	ARM: Merge for-2635-4/watchdog	2010-05-20 19:51:40 +09:00
Makefile	ARM: S3C6410: Add basic support for SmartQ machines	2010-05-20 19:42:15 +09:00
Makefile.boot
pm.c
s3c6400.c
s3c6410.c	ARM: SAMSUNG: Moving ADC device definition to plat-samsung.	2010-05-18 13:38:44 +09:00
setup-fb-24bpp.c
setup-i2c0.c
setup-i2c1.c
setup-sdhci-gpio.c
setup-sdhci.c
sleep.S