| commit | a01ee165a132fadb57659d26246e340d6ac53265 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 28 13:10:41 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon May 28 13:10:41 2012 -0700 |
| tree | da452e660fed2bcf8c9021cac65166308ea2db56 | |
| parent | d766023eea566bb3c2a57a0567af5b271908fdc2 [diff] | |
| parent | 8b56a30caaf9bc1850784f196636c5f550cc7577 [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.