diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 20:28:41 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-12 20:28:41 +0200 |
| commit | 15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c (patch) | |
| tree | 9e55cc5e2c635b8680c487d20b8ced63b5da0579 /arch/arm/mm/dma-mapping.c | |
| parent | printk: Fix calculation of length used to discard records (diff) | |
| parent | Btrfs: remove mnt_want_write call in btrfs_mksubvol (diff) | |
| download | linux-15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c.tar.xz linux-15fc5deb1f3e9f6e42213ab1bbb0a463e5366c9c.zip | |
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 'arch/arm/mm/dma-mapping.c')
0 files changed, 0 insertions, 0 deletions