From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 12 Aug 2012 18:28:41 +0000 (+0300)
Subject: Merge branch 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason... 
X-Git-Tag: v3.6-rc2~22
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c;p=profile%2Fivi%2Fkernel-x86-ivi.git

Merge branch 'for-linus-3.6' of git://git./linux/kernel/git/mason/linux-btrfs

Pull btrfs merge fix from Chris Mason:
 "This fixes a merge error in rc1.  The calls to mnt_want_write should
  have been removed."

* 'for-linus-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
  Btrfs: remove mnt_want_write call in btrfs_mksubvol
---

15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c