tree 9a86bc9593ef8219bfc469e277d1b327f38aed9e
parent 34e2fde8a496cf9d7c184ef12eafd3dd854586f1
parent efd124b999fb4d426b30675f1684521af0872789
author Linus Torvalds <torvalds@linux-foundation.org> 1262770867 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1262770867 -0800

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