From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 6 Jan 2010 09:41:07 +0000 (-0800)
Subject: Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
X-Git-Tag: v2.6.33-rc4~83
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c6f7afaeeda5b3c42ea8d7b27e197d223a04675e;p=~shefty%2Frdma-dev.git

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: simple_write_end does not mark_inode_dirty
  exofs: fix pnfs_osd re-definitions in pre-pnfs trees
---

c6f7afaeeda5b3c42ea8d7b27e197d223a04675e