Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Aug 2014 09:27:25 +0000 (10:27 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 5 Aug 2014 09:27:25 +0000 (10:27 +0100)
commitf15bdfe4fb264ac30d9c176f898cbd52cfd1ffa9
treed93b59190624c0df80854aff5078c588420c3516
parentc89c3a6acb847b03250a83cecae4f5c9ced2d960
parentc70fbb01b11cecfa13d9e746f462617d3ac0e38c
Merge branch 'devel-stable' into for-next

Conflicts:
arch/arm/kernel/perf_event_cpu.c
arch/arm/include/asm/memory.h
arch/arm/include/asm/uaccess.h
arch/arm/kernel/perf_event.c
arch/arm/kernel/perf_event_cpu.c
arch/arm/oprofile/common.c