diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 21:02:53 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-30 21:02:53 +0100 |
| commit | bfff6e92a33dce6121a3d83ef3809e9063b2734e (patch) | |
| tree | 14d4a919cac12ef0163308d5ceb49d97ac9b448c /drivers/char | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/iee... (diff) | |
| parent | ocfs2: export heartbeat thread pid via configfs (diff) | |
| download | linux-bfff6e92a33dce6121a3d83ef3809e9063b2734e.tar.xz linux-bfff6e92a33dce6121a3d83ef3809e9063b2734e.zip | |
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2
* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
ocfs2: export heartbeat thread pid via configfs
ocfs2: always unmap in ocfs2_data_convert_worker()
ocfs2: ignore NULL vfsmnt in ocfs2_should_update_atime()
ocfs2: Allow direct I/O read past end of file
ocfs2: don't print error in ocfs2_permission()
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions