Merge branch 'core/locking' into core/urgent
Ingo Molnar [Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)]
1  2 
kernel/sched.c
kernel/workqueue.c
mm/mmap.c

diff --cc kernel/sched.c
Simple merge
Simple merge
diff --cc mm/mmap.c
Simple merge