xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'restart' into for-linus

Browse Source 
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
This commit is contained in:
Russell King
2012-01-05 13:25:15 +00:00
parent 2e0e943436 0575fb754d
commit 7b9dd47136
592 changed files with 3091 additions and 5517 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/mach-sa1100/nanoengine.c
View File

@@ -117,4 +117,5 @@ MACHINE_START(NANOENGINE, "BSE nanoEngine")
.init_irq = sa1100_init_irq,
.timer = &sa1100_timer,
.init_machine = nanoengine_init,
.restart = sa11x0_restart,
MACHINE_END