projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: cf82ff7 964fe08)
Merge branch 'linus' into sched/core
authorIngo Molnar <mingo@elte.hu>
Sun, 25 Oct 2009 16:30:53 +0000 (17:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Sun, 25 Oct 2009 16:30:53 +0000 (17:30 +0100)
commit0b9e31e9264f1bad89856afb96da1688292f13b4
tree7a9e9b6456dce993efeed8734de0a15a1f16ae94tree | snapshot
parentcf82ff7ea7695b0e82ba07bc5e9f1bd03a74e1aacommit | diff
parent964fe080d94db82a3268443e9b9ece4c60246414commit | 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
Unnamed repository; edit this file 'description' to name the repository.