review.tizen.org Git - platform/kernel/linux-rpi.git/commit

projects / platform / kernel / linux-rpi.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cf82ff7 964fe08)

author	Ingo Molnar <mingo@elte.hu>
	Sun, 25 Oct 2009 16:30:53 +0000 (17:30 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Sun, 25 Oct 2009 16:30:53 +0000 (17:30 +0100)
commit	0b9e31e9264f1bad89856afb96da1688292f13b4
tree	7a9e9b6456dce993efeed8734de0a15a1f16ae94	tree \| snapshot
parent	cf82ff7ea7695b0e82ba07bc5e9f1bd03a74e1aa	commit \| diff
parent	964fe080d94db82a3268443e9b9ece4c60246414	commit \| diff

Merge branch 'linus' into sched/core

Conflicts:
fs/proc/array.c

Merge reason: resolve conflict and queue up dependent patch.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

fs/proc/array.c	diff1 \|	diff2 \|	blob \| history
kernel/cpuset.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Domain: System / Kernel;