From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 9 Mar 2009 16:13:16 +0000 (-0700)
Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=1c91ffc896cf839a3a0923c0062ff61c930a21e0;p=linux-edison.git

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
---

1c91ffc896cf839a3a0923c0062ff61c930a21e0