summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/traps.c
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2014-01-21 22:26:33 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2014-01-21 22:26:33 +0100
commit6f14d778c15fe08b6d98e759cf7e3893ed67b238 (patch)
treea0ac861030ad46d7b8f189bb851e53b75100d27a /arch/arm/kernel/traps.c
parentLinux 3.13-rc7 (diff)
parentARM: 7916/1: amba: Add clk_prepare|unprepare in runtime PM callbacks (diff)
parentARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling (diff)
parentARM: fix executability of CMA mappings (diff)
parentARM: SMP implementations are not supposed to return from smp_ops.cpu_die() (diff)
parentARM: 7935/1: sa1100: collie: add gpio-keys configuration (diff)
downloadlinux-6f14d778c15fe08b6d98e759cf7e3893ed67b238.tar.xz
linux-6f14d778c15fe08b6d98e759cf7e3893ed67b238.zip
Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next