q3k/linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
linux/arch/arm/mach-s5pc100
History
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/mach Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
clock.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
common.c ARM: 7251/1: restart: S5PC100: use new restart hook 2012-01-05 12:57:19 +00:00
common.h ARM: 7251/1: restart: S5PC100: use new restart hook 2012-01-05 12:57:19 +00:00
dev-audio.c ASoC: Samsung: Rename AC97 platform device 2010-11-23 14:05:29 +00:00
dma.c ARM: S5PC100: Modify platform data for pl330 driver 2011-12-23 10:07:08 +09:00
Kconfig ARM: S5PC100: Modified files for SPI consolidation work 2011-12-23 10:50:01 +09:00
mach-smdkc100.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
setup-fb-24bpp.c ARM: S5PC100: Cleanup mach/regs-fb.h from mach-s5pc100 2011-07-21 02:11:30 +09:00
setup-i2c0.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +09:00
setup-i2c1.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgall_range() 2010-10-23 11:50:59 +09:00
setup-ide.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-keypad.c ARM: S5PC100: 2nd Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:52:15 +09:00
setup-sdhci-gpio.c ARM: S5PC100: Change to using s3c_gpio_cfgrange_nopull() 2010-10-23 11:51:41 +09:00
setup-spi.c ARM: S5PC100: Modified files for SPI consolidation work 2011-12-23 10:50:01 +09:00