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)
commitc9572f010d369d9905309f63e31180f291b66a8a
treefbca2a0576c4223790e23a3c1d5f50e2bdf64e10
parent58cea307432e3376293e6b2be88d1f6e6e99274a
parentd4e4ab86bcba5a72779c43dc1459f71fea3d89c8
Merge tag 'v3.11-rc5' into perf/core

Merge Linux 3.11-rc5, to sync up with the latest upstream fixes since -rc1.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/powerpc/include/asm/perf_event_server.h
include/linux/sched.h
kernel/sched/fair.c