]> err.no Git - linux-2.6/commitdiff
Merge branch 'core/locking' into core/urgent
authorIngo Molnar <mingo@elte.hu>
Mon, 11 Aug 2008 22:11:49 +0000 (00:11 +0200)
committerIngo Molnar <mingo@elte.hu>
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