leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
142f2101a8
linux/arch/arm/mach-exynos
History
Arnd Bergmann 142f2101a8 Merge branch 'samsung/cleanup' into samsung/driver 
Conflicts:
	arch/arm/mach-s5p64x0/cpu.c -> common.c

More changes to a file that got moved into common.c,
see previous conflict resolutions.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-09 16:14:07 +00:00
..
include/mach Merge branch 'samsung/cleanup' into samsung/driver 2012-01-09 16:14:07 +00:00
clock-exynos4210.c ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] 2012-01-03 10:25:04 +00:00
clock-exynos4212.c ARM: 7257/1: EXYNOS: introduce arch/arm/mach-exynos/common.[ch] 2012-01-03 10:25:04 +00:00
clock.c Merge branch 'samsung/cleanup' into samsung/driver 2012-01-09 16:14:07 +00:00
common.c Merge branch 'depends/rmk/for-linus' into samsung/dt 2012-01-07 12:42:17 +00:00
common.h ARM: 7262/1: restart: EXYNOS: use new restart hook 2012-01-05 12:57:10 +00:00
cpuidle.c ARM: EXYNOS: Fix compiler error with THIS_MODULE 2011-11-09 14:07:32 +09:00
dev-ahci.c
dev-audio.c
dev-dwmci.c
dev-pd.c
dev-sysmmu.c Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux 2011-11-06 19:44:47 -08:00
dma.c ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build 2011-12-23 10:07:06 +09:00
headsmp.S
hotplug.c
Kconfig Merge branch 'samsung/cleanup' into samsung/driver 2012-01-09 16:14:07 +00:00
mach-armlex4210.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-exynos4-dt.c ARM: EXYNOS: Add Exynos4 device tree enabled board file 2011-12-23 10:07:11 +09:00
mach-nuri.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
mach-origen.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdk4x12.c Merge branch 'restart' into for-linus 2012-01-05 13:25:27 +00:00
mach-smdkv310.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
mach-universal_c210.c Merge branch 'samsung/dt' into samsung/cleanup 2012-01-09 16:01:00 +00:00
Makefile Merge branch 'samsung/cleanup' into samsung/driver 2012-01-09 16:14:07 +00:00
Makefile.boot
mct.c ARM: EXYNOS: Fix build error without CONFIG_LOCAL_TIMERS 2011-12-08 10:09:32 +09:00
platsmp.c ARM: gic: allow GIC to support non-banked setups 2011-11-15 18:13:03 +00:00
pm.c ARM: EXYNOS: remove exynos4_scu_enable() 2011-11-17 09:18:53 +09:00
pmu.c
setup-fimc.c
setup-fimd0.c
setup-i2c0.c
setup-i2c1.c
setup-i2c2.c
setup-i2c3.c
setup-i2c4.c
setup-i2c5.c
setup-i2c6.c
setup-i2c7.c
setup-keypad.c
setup-sdhci-gpio.c
setup-spi.c ARM: EXYNOS: Modified files for SPI consolidation work 2011-12-26 16:42:15 +09:00
setup-usb-phy.c