projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d766023 8b56a30)
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 May 2012 20:10:41 +0000 (13:10 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 28 May 2012 20:10:41 +0000 (13:10 -0700)
commita01ee165a132fadb57659d26246e340d6ac53265
treeda452e660fed2bcf8c9021cac65166308ea2db56tree | snapshot (tar.gz zip)
parentd766023eea566bb3c2a57a0567af5b271908fdc2commit | diff
parent8b56a30caaf9bc1850784f196636c5f550cc7577commit | diff
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.