From: Linus Torvalds Date: Tue, 2 Dec 2008 02:56:55 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Tag: v2.6.28-rc7~25 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8650e51ac94b5fe93c02e3c8fef02e416f14501c;p=linux-2.6-omap-h63xx.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: fix regression in ocfs2_read_blocks_sync() ocfs2: fix return value set in init_dlmfs_fs() ocfs2: Small documentation update ocfs2: fix wake_up in unlock_ast ocfs2: initialize stack_user lvbptr ocfs2: comments typo fix --- 8650e51ac94b5fe93c02e3c8fef02e416f14501c