Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-22 19:01:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
b2f1df8d2f
linux/arch/arm/mach-exynos
History
Arnd Bergmann b2f1df8d2f Merge branch 'renesas/timer' into next/timer 
Conflicts:
	arch/arm/mach-shmobile/timer.c

This resolves a nonobvious merge conflict between renesas
timer changes in the global timer changes with those
from the renesas soc branch and last minute bug fixes that
went into v3.3.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-03-20 09:41:43 +00:00
..
include/mach Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/davej/cpufreq 2012-01-11 18:53:33 -08:00
clock-exynos4210.c ARM: EXYNOS: Remove build warning without enabling PM 2012-01-27 14:56:24 +09:00
clock-exynos4212.c ARM: EXYNOS: Remove build warning without enabling PM 2012-01-27 14:56:24 +09:00
clock.c ARM: EXYNOS: Remove build warning without enabling PM 2012-01-27 14:56:24 +09:00
common.c Device tree conversions for samsung and tegra 2012-01-09 14:28:38 -08: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-ohci.c ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00
dev-pd.c
dev-sysmmu.c
dma.c ARM: EXYNOS: Limit usage of pl330 device instance to non-dt build 2011-12-23 10:07:06 +09:00
headsmp.S ARM: exynos: remove incorrect BSYM usage 2012-01-16 08:36:04 -06:00
hotplug.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
Kconfig Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-armlex4210.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-exynos4-dt.c ARM: EXYNOS: Bring exynos4-dt up to date 2012-02-09 18:40:22 +09:00
mach-nuri.c ARM: EXYNOS: Correct framebuffer window size on Nuri board 2012-01-31 12:58:31 +09:00
mach-origen.c ARM: EXYNOS: Invert VCLK polarity for framebuffer on ORIGEN 2012-01-12 02:20:59 +09:00
mach-smdk4x12.c Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
mach-smdkv310.c Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
mach-universal_c210.c ARM: EXYNOS: fix touchscreen IRQ setup on Universal C210 board 2012-03-06 02:25:15 -08:00
Makefile Merge branch 'samsung/driver' into next/drivers 2012-01-09 16:16:29 +00:00
Makefile.boot
mct.c ARM: local timers: convert exynos to runtime registration interface 2012-03-13 13:45:54 +00:00
platsmp.c ARM: 7293/1: logical_cpu_map: decouple CPU mapping from SMP 2012-01-23 10:20:05 +00:00
pm.c ARM: EXYNOS: Fix "warning: initialization from incompatible pointer type" 2012-01-27 15:30:48 +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 ARM: EXYNOS: Add USB OHCI device 2011-12-23 11:21:28 +09:00