Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
kernel-fxtec-pro1x/arch/arm/mach-s5p64x0
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-s5p6440.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
clock-s5p6450.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
clock.c ARM: 7246/1: S5P64X0: introduce arch/arm/mach-s5p64x0/common.[ch] 2011-12-23 19:11:05 +00:00
common.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
common.h ARM: 7250/1: restart: S5P64X0: use new restart hook 2012-01-05 12:57:19 +00:00
dev-audio.c ARM: S5P64X0: Segregate audio devices 2010-12-30 08:24:27 +09:00
dma.c ARM: S5P64x0: Modify platform data for pl330 driver 2011-12-23 10:07:07 +09:00
gpiolib.c gpio/s5p64x0: move gpio driver into drivers/gpio/ 2011-09-21 10:52:39 +09:00
irq-pm.c ARM: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
Kconfig ARM: S5P64X0: Modified files for SPI consolidation work 2011-12-23 10:50:02 +09:00
mach-smdk6440.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk6450.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: S5P64X0: Add Power Management support 2011-10-04 20:31:24 +09:00
setup-fb-24bpp.c ARM: S5P64X0: Add GPIO setup for LCD 2011-10-04 19:00:53 +09:00
setup-i2c0.c
setup-i2c1.c
setup-spi.c ARM: S5P64X0: Modified files for SPI consolidation work 2011-12-23 10:50:02 +09:00