commit | 4c098bcd55fad34dcf224bf8343db6a9ac58fc68 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 09 14:00:16 2009 -0800 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Feb 09 14:00:16 2009 -0800 |
tree | ba2070fbdb19bc6a2cb648ec5e95d14822ad085d | |
parent | d006b2b620ebf87a1d5592fbd7ae75d4a6da8423 [diff] | |
parent | 284b066af41579f62649048fdec5c5e7091703e6 [diff] |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable * git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable: Btrfs: don't use spin_is_contended