]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
projects / thirdparty / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 970d96f bcc8fa8)
Merge branch 'devel-stable' into for-next
authorRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:57 +0000 (21:18 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 12 Jun 2015 20:18:57 +0000 (21:18 +0100)
Conflicts:
arch/arm/kernel/perf_event_cpu.c

1  2 
arch/arm/kernel/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/kernel/Makefile
Simple merge
A mirror of Linus' kernel repository