]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dc6e00a df56f46)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.osdl.org>
Sat, 30 Dec 2006 20:02:53 +0000 (12:02 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Sat, 30 Dec 2006 20:02:53 +0000 (12:02 -0800)
commitb7374858e3eb40a4a9e8a454290fab1fe63aff1c
tree14d4a919cac12ef0163308d5ceb49d97ac9b448ctree | snapshot
parentdc6e00af4ec6910a77f2ed33da20f9cac53e6d45commit | diff
parentdf56f46d1fd964af224367f9d8ecbc9fd9653ebbcommit | diff
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()
Linux Kernel Source Tree.