Arnd Bergmann 421b759b86 Merge branch 'samsung/cleanup' into next/boards ... Conflicts: arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-omap2/board-ti8168evm.c arch/arm/mach-s3c64xx/Kconfig arch/arm/mach-tegra/Makefile arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/common.c Lots of relatively simple conflicts between the board changes and stuff from the arm tree. This pulls in the resolution from the samsung/cleanup tree, so we don't get conflicting merges. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 17:06:36 +00:00
..
crag6410.h	ARM: S3C64XX: Hook up Littlemill audio card on Cragganmore	2011-12-02 14:32:32 +09:00
debug-macro.S
dma.h
entry-macro.S	ARM: s3c64xx: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:03 +00:00
gpio.h	ARM: S3C64XX: Update for conversion to SAMSUNG_GPIO_EXTRA	2011-11-08 19:56:02 +09:00
hardware.h
io.h
irqs.h	ARM: S3C64XX: Hook up Littlemill audio card on Cragganmore	2011-12-02 14:32:32 +09:00
map.h	ARM: S3C64XX: Modified files for SPI consolidation work	2011-12-23 10:50:00 +09:00
pm-core.h
regs-clock.h
regs-gpio-memport.h
regs-gpio.h
regs-irq.h
regs-modem.h
regs-srom.h
regs-sys.h
regs-syscon-power.h
spi-clocks.h
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
tick.h
timex.h
uncompress.h