diff options
author | Russell King | 2015-06-12 22:18:57 +0200 |
---|---|---|
committer | Russell King | 2015-06-12 22:18:57 +0200 |
commit | 27a513ca8600e96790f9f3a3c3182da947e569d2 (patch) | |
tree | 48319c0a53dd76dc2dff6cb15da5c5f145e72cc3 /arch/mn10300/proc-mn2ws0050 | |
parent | ARM: 8383/1: nommu: avoid deprecated source register on mov (diff) | |
parent | Merge branch 'for-rmk/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
download | kernel-qcow2-linux-27a513ca8600e96790f9f3a3c3182da947e569d2.tar.gz kernel-qcow2-linux-27a513ca8600e96790f9f3a3c3182da947e569d2.tar.xz kernel-qcow2-linux-27a513ca8600e96790f9f3a3c3182da947e569d2.zip |
Merge branch 'devel-stable' into for-next
Conflicts:
arch/arm/kernel/perf_event_cpu.c
Diffstat (limited to 'arch/mn10300/proc-mn2ws0050')
0 files changed, 0 insertions, 0 deletions