diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 11:58:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-11-12 11:58:59 +0100 |
| commit | df762eccbadf87850fbee444d729e0f1b1e946f1 (patch) | |
| tree | 1bf47bbbd4ea91e343f983b3b50ec2ec73a739e1 /kernel/up.c | |
| parent | Merge branch 'misc' into for-next (diff) | |
| parent | ARM: 7878/1: nommu: Implement dummy early_paging_init() (diff) | |
| download | linux-df762eccbadf87850fbee444d729e0f1b1e946f1.tar.xz linux-df762eccbadf87850fbee444d729e0f1b1e946f1.zip | |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/include/asm/atomic.h
arch/arm/include/asm/hardirq.h
arch/arm/kernel/smp.c
Diffstat (limited to 'kernel/up.c')
0 files changed, 0 insertions, 0 deletions