Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jan 2014 02:21:22 +0000 (18:21 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Jan 2014 02:21:22 +0000 (18:21 -0800)
commitf1499382f114231cbd1e3dee7e656b50ce9d8236
tree0304f857428b3f5f4eac6dd9ebaa4ceef2b28d91
parent4db658ea0ca2312b5d168230476ec7729385aefe
parent7c71ee78031c248dca13fc94dea9a4cc217db6cf
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