]> err.no Git - linux-2.6/commitdiff
projects / linux-2.6 / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e56b3bc f934fb1)
Merge branch 'linus' into cpus4096
authorIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000 (23:32 +0200)
committerIngo Molnar <mingo@elte.hu>
Mon, 28 Jul 2008 21:32:00 +0000 (23:32 +0200)
Conflicts:

kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
1  2 
kernel/cpu.c patch | diff1 | diff2 | blob | history

diff --cc kernel/cpu.c
Simple merge
Linux 2.6 source tree