]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'linus' into core/locking
authorIngo Molnar <mingo@elte.hu>
Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
committerIngo Molnar <mingo@elte.hu>
Sat, 7 Feb 2009 17:31:54 +0000 (18:31 +0100)
Conflicts:
fs/btrfs/locking.c

1  2 
include/linux/sched.h
kernel/sched.c

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