diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-21 22:26:33 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-01-21 22:26:33 +0100 |
commit | 6f14d778c15fe08b6d98e759cf7e3893ed67b238 (patch) | |
tree | a0ac861030ad46d7b8f189bb851e53b75100d27a /arch/arm/kernel/traps.c | |
parent | Linux 3.13-rc7 (diff) | |
parent | ARM: 7916/1: amba: Add clk_prepare|unprepare in runtime PM callbacks (diff) | |
parent | ARM: 7938/1: OMAP4/highbank: Flush L2 cache before disabling (diff) | |
parent | ARM: fix executability of CMA mappings (diff) | |
parent | ARM: SMP implementations are not supposed to return from smp_ops.cpu_die() (diff) | |
parent | ARM: 7935/1: sa1100: collie: add gpio-keys configuration (diff) | |
download | linux-6f14d778c15fe08b6d98e759cf7e3893ed67b238.tar.xz linux-6f14d778c15fe08b6d98e759cf7e3893ed67b238.zip |
Merge branches 'amba', 'fixes', 'kees', 'misc' and 'unstable/sa11x0' into for-next