| commit | 15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c | |
| author | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 12 Aug 2012 18:28:41 +0000 (12 21:28 +0300) | ||
| committer | Linus Torvalds <torvalds@linux-foundation.org> | |
| Sun, 12 Aug 2012 18:28:41 +0000 (12 21:28 +0300) | ||
| tree | 9e55cc5e2c635b8680c487d20b8ced63b5da0579 | treesnapshot (tar.gz zip) |
| parent | e3756477aec028427fec767957c0d4b6cfb87208 | commitdiff |
| parent | e00da2067b78a9246f767012a3803224c40b1f9f | commitdiff |
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
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