From: Linus Torvalds Date: Sat, 30 Dec 2006 20:02:53 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Tag: v2.6.20-rc3~6 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=bfff6e92a33dce6121a3d83ef3809e9063b2734e;p=karo-tx-linux.git 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() --- bfff6e92a33dce6121a3d83ef3809e9063b2734e