projects / openwrt / staging / blogic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 7283670 92efc15)
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)
commitbfff6e92a33dce6121a3d83ef3809e9063b2734e
tree14d4a919cac12ef0163308d5ceb49d97ac9b448ctree | snapshot
parent72836708c6218d91db982ae48c5c62293e78ed7ccommit | diff
parent92efc15241ceebc23451691971897020e8563a70commit | diff
Merge branch 'upstream-linus' of git://git./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()
John Crispins staging tree