| commit | c6f7afaeeda5b3c42ea8d7b27e197d223a04675e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 06 01:41:07 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Wed Jan 06 01:41:07 2010 -0800 |
| tree | 9a86bc9593ef8219bfc469e277d1b327f38aed9e | |
| parent | 34e2fde8a496cf9d7c184ef12eafd3dd854586f1 [diff] | |
| parent | efd124b999fb4d426b30675f1684521af0872789 [diff] |
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