From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Jan 2014 02:21:22 +0000 (-0800)
Subject: Merge tag 'xfs-for-linus-v3.14-rc1-2' of git://oss.sgi.com/xfs/xfs
X-Git-Tag: v3.14-rc1~69
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f1499382f114231cbd1e3dee7e656b50ce9d8236;p=kernel%2Fkernel-generic.git

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
---

f1499382f114231cbd1e3dee7e656b50ce9d8236