Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-08 05:01:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
421b759b86
linux/arch/arm/mach-s3c64xx/include/mach
History
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 ARM: add an extra temp register to the low level debugging addruart macro 2011-09-26 10:11:25 -04:00
dma.h ARM: SAMSUNG: Remove Samsung specific enum type for dma direction 2011-09-14 11:10:04 +05:30
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 ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
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 ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
regs-clock.h ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410 2010-08-05 18:32:50 +09:00
regs-gpio-memport.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-gpio.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-irq.h
regs-modem.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-srom.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
regs-sys.h ARM: S3C64XX: Add support for synchronous clock operation 2011-09-19 16:38:11 +09:00
regs-syscon-power.h ARM: S3C64XX: Move headers into machine include directory 2010-02-20 22:31:17 +00:00
spi-clocks.h ARM: S3C64XX: Move device and device setup into mach-s3c64xx 2010-02-20 22:32:01 +00:00
system.h ARM: restart: remove the now empty arch_reset() 2012-01-05 12:57:22 +00:00
tick.h
timex.h ARM: SAMSUNG: Move include/mach files out of plat-s3c 2010-02-24 01:52:12 +00:00
uncompress.h