leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
38abdcd0d0
linux/arch/arm/mach-s3c2412
History
Arnd Bergmann 38abdcd0d0 Merge branch 'for-armsoc' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm into next/soc2 
Conflicts:
	arch/arm/mach-tegra/common.c
	arch/arm/mach-ux500/devices-common.c

This resolves two conflicts and lets us merge the exynos5 branch
cleanly.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-15 21:05:52 +00:00
..
clock.c Device tree conversions for samsung and tegra 2012-01-09 14:28:38 -08:00
cpu-freq.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
dma.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
gpio.c ARM: SAMSUNG: Update the name of regarding Samsung GPIO 2011-09-21 15:07:04 +09:00
irq.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
Kconfig gpio/s3c24xx: move gpio driver into drivers/gpio/ 2011-09-21 10:52:22 +09:00
mach-jive.c ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
mach-smdk2413.c ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
mach-vstms.c ARM: 7254/1: restart: S3C24XX: move SWRST based S3C platforms to 2012-01-05 12:57:18 +00:00
Makefile gpio/s3c24xx: move gpio driver into drivers/gpio/ 2011-09-21 10:52:22 +09:00
pm.c ARM: SAMSUNG: Fix missing api-change from subsys_interface change 2012-01-27 15:35:47 +09:00
s3c2412.c ARM: s3c24xx: move special idle code to out of line 2012-01-20 18:55:13 -05:00
sleep.S [ARM] Move include/asm-arm/arch-* to arch/arm/*/include/mach 2008-08-07 09:55:48 +01:00