tree ba2070fbdb19bc6a2cb648ec5e95d14822ad085d
parent d006b2b620ebf87a1d5592fbd7ae75d4a6da8423
parent 284b066af41579f62649048fdec5c5e7091703e6
author Linus Torvalds <torvalds@linux-foundation.org> 1234216816 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1234216816 -0800

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