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)
commit23a0ee908cbfba3264d19729c67c22b20fa73886
tree541103f6283cbac6b82cff88a7b91128acfce046
parentcc7a486cac78f6fc1a24e8cd63036bae8d2ab431
parent0f2bc27be27ca1dcc66b96131e44bf7648b959c6
Merge branch 'core/locking' into core/urgent
kernel/sched.c
kernel/workqueue.c
mm/mmap.c