diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 18:28:41 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 18:28:41 (GMT) |
| commit | 15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c (patch) | |
| tree | 9e55cc5e2c635b8680c487d20b8ced63b5da0579 /firmware/acenic | |
| parent | e3756477aec028427fec767957c0d4b6cfb87208 (diff) | |
| parent | e00da2067b78a9246f767012a3803224c40b1f9f (diff) | |
| download | linux-fsl-qoriq-15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c.tar.xz | |
Merge branch 'for-linus-3.6' of git://git.kernel.org/pub/scm/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
Diffstat (limited to 'firmware/acenic')
0 files changed, 0 insertions, 0 deletions