]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commite55de54aabc5d08d3337fcacd702c6dbb8bef62d
tree38c60215646d079fab3bff812e094e914960c7ec
parent8df468040375bae4e5cd992a1e349b6004dd0f80
parent2ba45529243d82e43fa4089d1e81c21bf5ea4adc
Merge branch 'linus' into core/locking

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