git.maquefel.me Git - linux.git/commit

projects / linux.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b9bb50d 9450d57)

author	Ingo Molnar <mingo@kernel.org>
	Tue, 4 Sep 2012 12:31:00 +0000 (14:31 +0200)
committer	Ingo Molnar <mingo@kernel.org>
	Tue, 4 Sep 2012 12:31:00 +0000 (14:31 +0200)
commit	59f979455d7209171ab10a72c8df5c2512976cb4
tree	c4c7fc48bd79bf8acbe848a1b979fa9e8ab4ac6a	tree \| snapshot
parent	b9bb50db9126c4ccad78af2dfb77277ca17c9b64	commit \| diff
parent	9450d57eab5cad36774c297da123062744472588	commit \| diff

Merge branch 'sched/urgent' into sched/core

Merge in the current fixes branch, we are going to apply dependent patches.

Signed-off-by: Ingo Molnar <mingo@kernel.org>

arch/s390/Kconfig	diff1 \|	diff2 \|	blob \| history
kernel/sched/core.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/fair.c	diff1 \|	diff2 \|	blob \| history
kernel/sched/sched.h	diff1 \|	diff2 \|	blob \| history

ep93xx device tree rework repo: git://git.maquefel.me/linux.git