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)
commit673f8205914a12e928c65afbcd78ae748f78df53
tree38c60215646d079fab3bff812e094e914960c7ec
parentcf47b8f3d96b0b8b10b557444a28b3ca4024ff82
parentae1a25da8448271a99745da03100d5299575a269
Merge branch 'linus' into core/locking

Conflicts:
fs/btrfs/locking.c
include/linux/sched.h
kernel/sched.c