]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
projects / karo-tx-linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6751684 ecb2cf1)
Merge branch 'linus' into perf/core
authorIngo Molnar <mingo@kernel.org>
Fri, 19 Jul 2013 07:34:42 +0000 (09:34 +0200)
committerIngo Molnar <mingo@kernel.org>
Fri, 19 Jul 2013 07:34:42 +0000 (09:34 +0200)
Merge in a v3.11-rc1-ish branch to go from v3.10 based development
to a v3.11 based one.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
kernel/events/core.c patch | diff1 | diff2 | blob | history

diff --cc kernel/events/core.c
Simple merge
Linux kernel for KaRo TX COM modules