From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 28 Jan 2014 18:57:14 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Url: http://pileus.org/git/?p=~andy%2Flinux;a=commitdiff_plain;h=08d21b5f93eb92a781daea71b6fcb3a340909141

Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

Pull exofs and ore fixes from Boaz Harrosh:
 "The main fix here, the first patch, is also destined for -stable.  The
  rest is small trivia and cosmetics.  The ORE patches effect both exofs
  and pnfs-objects very reproducible bugs"

[ ORE is "object raid engine", used by exofs and pnfs  - Linus ]

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Print less in r4w
  exofs: Allow corrupted directory entry to be empty file
  exofs: Allow O_DIRECT open
  ore: Don't crash on NULL bio in _clear_bio
  ore: Fix wrong math in allocation of per device BIO
---

08d21b5f93eb92a781daea71b6fcb3a340909141