From: Linus Torvalds Date: Mon, 9 Feb 2009 22:00:16 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/mason/btrfs-unstable X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=4c098bcd55fad34dcf224bf8343db6a9ac58fc68;p=linux-2.6-omap-h63xx.git Merge git://git.kernel.org/pub/scm/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 --- 4c098bcd55fad34dcf224bf8343db6a9ac58fc68