From: Linus Torvalds Date: Wed, 24 Jun 2009 02:36:02 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=cf5434e894a17bb8385997adc6d56642055a85d6;p=openwrt%2Fstaging%2Fblogic.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/ocfs2 * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2: ocfs2/trivial: Wrap ocfs2_sysfile_cluster_lock_key within define. ocfs2: Add lockdep annotations vfs: Set special lockdep map for dirs only if not set by fs ocfs2: Disable orphan scanning for local and hard-ro mounts ocfs2: Do not initialize lvb in ocfs2_orphan_scan_lock_res_init() ocfs2: Stop orphan scan as early as possible during umount ocfs2: Fix ocfs2_osb_dump() ocfs2: Pin journal head before accessing jh->b_committed_data ocfs2: Update atime in splice read if necessary. ocfs2: Provide the ocfs2_dlm_lvb_valid() stack API. --- cf5434e894a17bb8385997adc6d56642055a85d6