]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitc6541ecc0585b2f0b655f390fe10a00d3523c8d6
treed93b59190624c0df80854aff5078c588420c3516
parentaf0158b4a21178bd5092f6d672884ef4a7344543
parentf9128b7ae94327d759b56b2c23484b948f0fa660
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