projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58cea30 d4e4ab8)
Merge tag 'v3.11-rc5' into perf/core
authorIngo Molnar <mingo@kernel.org>
Thu, 15 Aug 2013 08:00:09 +0000 (10:00 +0200)
committerIngo Molnar <mingo@kernel.org>
Thu, 15 Aug 2013 08:00:09 +0000 (10:00 +0200)
Merge Linux 3.11-rc5, to sync up with the latest upstream fixes since -rc1.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
arch/powerpc/include/asm/perf_event_server.h patch | diff1 | diff2 | blob | history
include/linux/sched.h patch | diff1 | diff2 | blob | history
kernel/sched/fair.c patch | diff1 | diff2 | blob | history

diff --cc include/linux/sched.h
Simple merge
diff --cc kernel/sched/fair.c
Simple merge
John Crispins staging tree