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)
commit1c91ffc896cf839a3a0923c0062ff61c930a21e0
treeaa17696055c9a3176f3be3cfdda009e7b71922cc
parent6d5b5acca9e566515ef3f1ed617e7295c4f94345
parentb9447ef80bd301b932ac4d85c9622e929de5fd62
Merge git://git./linux/kernel/git/mason/btrfs-unstable

* git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable:
  Btrfs: fix spinlock assertions on UP systems