Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Feb 2009 22:00:16 +0000 (14:00 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Feb 2009 22:00:16 +0000 (14:00 -0800)
commit4c098bcd55fad34dcf224bf8343db6a9ac58fc68
treeba2070fbdb19bc6a2cb648ec5e95d14822ad085d
parentd006b2b620ebf87a1d5592fbd7ae75d4a6da8423
parent284b066af41579f62649048fdec5c5e7091703e6
Merge git://git./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