diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 03:21:22 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-29 03:21:22 +0100 |
| commit | f1499382f114231cbd1e3dee7e656b50ce9d8236 (patch) | |
| tree | 0304f857428b3f5f4eac6dd9ebaa4ceef2b28d91 /arch/arm/mach-mvebu/mvebu-soc-id.c | |
| parent | ceph: Fix up after semantic merge conflict (diff) | |
| parent | xfs: allow logical-sector sized O_DIRECT (diff) | |
| download | linux-f1499382f114231cbd1e3dee7e656b50ce9d8236.tar.xz linux-f1499382f114231cbd1e3dee7e656b50ce9d8236.zip | |
Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs
Pull second xfs update from Ben Myers:
"Allow logical sector sized direct io on 'advanced format' 4k/512 disk"
* tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs:
xfs: allow logical-sector sized O_DIRECT
xfs: rename xfs_buftarg structure members
xfs: clean up xfs_buftarg
Diffstat (limited to 'arch/arm/mach-mvebu/mvebu-soc-id.c')
0 files changed, 0 insertions, 0 deletions