From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 28 May 2012 20:10:41 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a01ee165a132fadb57659d26246e340d6ac53265;p=linux-beck.git

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

Pull exofs updates from Boaz Harrosh:
 "Just a couple of patches.  The first is a BUG fix destined for stable
  which missed the 3.4-rc7 Kernel.  The second is just a fixture
  addition so exofs is able to be better exported as a cluster file
  system via pNFS."

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: Add SYSFS info for autologin/pNFS export
  exofs: Fix CRASH on very early IO errors.
---

a01ee165a132fadb57659d26246e340d6ac53265