Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-09-21 20:04:01 +00:00
Code Issues Projects Releases Wiki Activity
android_kernel_samsung_msm8976/arch/arm/plat-spear
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
..
include/plat Merge branch 'depends/rmk/restart' into next/cleanup 2012-01-07 11:51:28 +00:00
clock.c switch assorted clock drivers to debugfs_remove_recursive() 2011-07-20 20:47:51 -04:00
Kconfig
Makefile ARM: restart: spear: use new restart hook 2012-01-05 12:57:20 +00:00
padmux.c arm: plat-spear: fix typo in kerneldoc 2010-07-19 11:04:14 +02:00
restart.c ARM: restart: spear: use new restart hook 2012-01-05 12:57:20 +00:00
shirq.c arm: Fold irq_set_chip/irq_set_handler 2011-03-29 14:47:58 +02:00
time.c clocksource: convert SPEAr platforms 16-bit up counting clocksource 2011-05-23 18:04:52 +01:00