Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 14:57:38 +0000 (07:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 24 Mar 2011 14:57:38 +0000 (07:57 -0700)
commit1b506cfb6ae63f352643d6e208c85c1351547036
tree4556cbdb0443eadc4406778a45d7b771f0dc7be7
parent4cc4d24efce4672f9b0e7fa27963770ae602998f
parenta49fb4c3d035ab516507b31ec3bd49263caee14d
Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd

* 'for-linus' of git://git.open-osd.org/linux-open-osd:
  exofs: deprecate the commands pending counter
  exofs: Write sbi->s_nextid as part of the Create command
  exofs: Add option to mount by osdname
  exofs: Override read-ahead to align on stripe_size
  exofs: simple fsync race fix
  exofs: Optimize read_4_write
  exofs: Trivial: fix some indentation and debug prints
  exofs: Remove redundant unlikely()