Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-07 04:09:21 +00:00
Code Issues Projects Releases Wiki Activity
android_kernel_samsung_msm8976/arch/arm/plat-mxc
History
Arnd Bergmann 40ba95fdf1 Merge branch 'depends/rmk/restart' into next/cleanup 
Conflicts:
	arch/arm/mach-at91/at91cap9.c
	arch/arm/mach-at91/at91sam9260.c
	arch/arm/mach-at91/at91sam9261.c
	arch/arm/mach-at91/at91sam9263.c
	arch/arm/mach-at91/at91sam9g45.c
	arch/arm/mach-at91/at91sam9rl.c
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-shmobile/board-kota2.c

This resolves a bunch of conflicts between the arm-soc tree
and changes from the arm tree that have gone upstream.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2012-01-07 11:51:28 +00:00
..
devices Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:16:43 -07:00
include/mach Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
3ds_debugboard.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
audmux-v1.c
audmux-v2.c ARM i.MX audmux v2: remove unnecessary ifdefs 2011-08-26 10:02:28 +02:00
avic.c ARM:i.MX: fix build error in tzic/avic.c 2011-11-04 03:54:17 +08:00
clock.c
cpu.c ARM: imx: Introduce generic function for displaying silicon revision 2011-08-26 08:50:58 +02:00
cpufreq.c ARM: imx: fix cpufreq build errors 2011-12-09 11:01:18 +01:00
devices.c Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc 2011-11-01 20:11:00 -07:00
epit.c clocksource: convert ARM 32-bit down counting clocksources 2011-05-23 18:04:51 +01:00
iomux-v1.c ARM: mxc: iomux-v1: Fix build warning 2011-07-07 09:07:33 +02:00
iomux-v3.c
iram_alloc.c
irq-common.c ARM i.MX avic: convert to use generic irq chip 2011-09-23 08:32:14 +02:00
irq-common.h ARM i.MX avic: convert to use generic irq chip 2011-09-23 08:32:14 +02:00
Kconfig arm/imx: fix AUTO_ZRELADDR selection 2011-11-11 16:53:34 +01:00
Makefile ARM: imx: convert smp platforms to global gic_handle_irq() 2011-11-15 18:13:59 +00:00
pwm.c MXC PWM: should active during DOZE/WAIT/DBG mode 2011-12-09 11:00:49 +01:00
ssi-fiq-ksym.c
ssi-fiq.S ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL 2011-04-12 09:48:10 +02:00
system.c ARM: restart: mxc: use new restart hook 2012-01-05 12:57:15 +00:00
time.c Merge branch 'devel-stable' into for-linus 2011-05-23 19:28:04 +01:00
tzic.c ARM:i.MX: fix build error in tzic/avic.c 2011-11-04 03:54:17 +08:00
ulpi.c