From: Linus Torvalds Date: Thu, 16 Feb 2006 22:04:08 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 X-Git-Tag: v2.6.16-rc4~40 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=ab479995b191b4256183956c13caabb86331af8e;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 --- ab479995b191b4256183956c13caabb86331af8e