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)
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: don't use spin_is_contended


Trivial merge