Arnd Bergmann a07613a54d Merge branch 'samsung/dt' into samsung/cleanup ... Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:01:00 +00:00
..
include/plat	Merge branch 'samsung/dt' into samsung/cleanup	2012-01-09 16:01:00 +00:00
adc.c	ARM: SAMSUNG: Add support s3c2416-adc for S3C2416/S3C2450	2011-10-14 15:15:42 +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: fix watchdog reset issue with clk_get()	2011-09-15 13:59:58 +09:00
cpu.c	ARM: SAMSUNG: Add support for handling of cpu revision	2011-08-24 19:25:19 +09:00
dev-backlight.c	ARM: SAMSUNG: remove duplicated header include	2011-12-08 10:09:29 +09:00
dev-uart.c	ARM: SAMSUNG: Include devs.h in dev-uart.c to prototype devices	2011-03-04 15:46:26 +09:00
devs.c	ARM: S5PC100: Modified files for SPI consolidation work	2011-12-23 10:50:01 +09:00
dma-ops.c	ARM: SAMSUNG: Add device tree support for pl330 dma engine wrappers	2011-12-23 10:07:05 +09:00
dma.c	ARM: SAMSUNG: DMA Cleanup as per sparse	2011-07-16 15:50:19 +09:00
init.c	ARM: SAMSUNG: Add support for handling of cpu revision	2011-08-24 19:25:19 +09:00
irq-vic-timer.c	ARM: SAMSUNG: Add chained enrty/exit call to timer interrupt handler	2011-08-19 20:57:37 +09:00
Kconfig	ARM: SAMSUNG: Consolidation of SPI platform devices to plat-samsung	2011-12-23 10:49:53 +09:00
Makefile	Merge branch 'next/cleanup3' of git://git.linaro.org/people/arnd/arm-soc	2011-11-05 18:18:05 -07:00
pd.c	ARM: SAMSUNG: inclusion export.h instead of module.h	2011-11-17 01:14:38 +09:00
platformdata.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
pm-check.c	treewide: Convert uses of struct resource to resource_size(ptr)	2011-06-10 14:55:36 +02:00
pm-gpio.c	ARM: SAMSUNG: Update the name of regarding Samsung GPIO	2011-09-21 15:07:04 +09:00
pm.c	ARM: SAMSUNG: Update the name of regarding Samsung GPIO	2011-09-21 15:07:04 +09:00
pwm-clock.c	ARM: SAMSUNG: Consolidate plat/pwm-clock.h	2011-10-04 19:48:41 +09:00
pwm.c	ARM: SAMSUNG: inclusion export.h instead of module.h	2011-11-17 01:14:38 +09:00
s3c-dma-ops.c	arm: Add export.h to recently added files for EXPORT_SYMBOL	2011-11-07 10:28:58 -08:00
time.c	ARM: S3C24XX: Add clkdev support	2011-07-20 19:11:29 +09:00
wakeup-mask.c	arm: plat-samsung: Use proper irq accessor functions	2011-03-29 14:47:53 +02:00