Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Mar 2009 16:13:16 +0000 (09:13 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 9 Mar 2009 16:13:16 +0000 (09:13 -0700)
* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix spinlock assertions on UP systems


Trivial merge