| commit | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 05 13:25:15 2012 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Thu Jan 05 13:25:27 2012 +0000 |
| tree | b835312e76fe323de3e1cbbb0d15fca5a3f7ef9c | |
| parent | 2e0e943436912ffe0848ece58167edfe754edb96 [diff] | |
| parent | 0575fb754dbfc32a01f297e778533340a533ec68 [diff] |
Merge branch 'restart' into for-linus Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c.