asedeno.scripts.mit.edu Git - linux.git/commit

]> asedeno.scripts.mit.edu Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 58cea30 d4e4ab8)

author	Ingo Molnar <mingo@kernel.org>
	Thu, 15 Aug 2013 08:00:09 +0000 (10:00 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Thu, 15 Aug 2013 08:00:09 +0000 (10:00 +0200)
commit	c9572f010d369d9905309f63e31180f291b66a8a
tree	fbca2a0576c4223790e23a3c1d5f50e2bdf64e10	tree \| snapshot
parent	58cea307432e3376293e6b2be88d1f6e6e99274a	commit \| diff
parent	d4e4ab86bcba5a72779c43dc1459f71fea3d89c8	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history

local clone of linux.git