Merge branch 'for-linus' of git://git.open-osd.org/linux-open-osd
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 09:41:07 +0000 (01:41 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 6 Jan 2010 09:41:07 +0000 (01:41 -0800)
commitc6f7afaeeda5b3c42ea8d7b27e197d223a04675e
tree9a86bc9593ef8219bfc469e277d1b327f38aed9e
parent34e2fde8a496cf9d7c184ef12eafd3dd854586f1
parentefd124b999fb4d426b30675f1684521af0872789
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