]> 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)
commit2b8e06215bc61722b2dd67d425b33f71f9848bae
treed93b59190624c0df80854aff5078c588420c3516
parent544b8fec3f379a6956fe340f04a276fc203e246a
parentb4d52595e1de1209b8db69aeab0fbccc37f53386
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