leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
421b759b86
linux/arch/arm/mach-s3c64xx
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
..
include/mach Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
clock.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
common.c ARM: 7266/1: restart: S3C64XX: use new restart hook 2012-01-05 12:57:18 +00:00
common.h ARM: 7266/1: restart: S3C64XX: use new restart hook 2012-01-05 12:57:18 +00:00
dev-audio.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dev-uart.c
dma.c Merge branch 'next/topic-dma-samsung' into next-samsung-devel 2011-10-04 18:57:38 +09:00
irq-pm.c
Kconfig Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mach-anw6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-crag6410-module.c Merge branch 'samsung/board' into next/boards 2011-12-16 14:56:37 -08:00
mach-crag6410.c Merge branch 'samsung/cleanup' into next/boards 2012-01-09 17:06:36 +00:00
mach-hmt.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-mini6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-ncp.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-real6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq5.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq7.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smartq.c ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
mach-smartq.h
mach-smdk6400.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6410.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
Makefile Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
pm.c ARM: S3C64XX: Power gate unused domains 2011-12-03 19:49:26 +09:00
s3c6400.c Merge branch 'for-russell' of git://hansjkoch.de/git/linux-tcc into HEAD 2012-01-05 12:55:03 +00:00
s3c6410.c ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch] 2011-12-23 19:07:55 +00:00
setup-fb-24bpp.c ARM: S3C64XX: Remove extern from definition of framebuffer setup call 2011-12-02 14:17:36 +09:00
setup-i2c0.c
setup-i2c1.c
setup-ide.c
setup-keypad.c
setup-sdhci-gpio.c
setup-spi.c ARM: S3C64XX: Modified files for SPI consolidation work 2011-12-23 10:50:00 +09:00
sleep.S