From: Linus Torvalds Date: Fri, 3 Feb 2006 23:21:40 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d1ffa5669cd834f901141756e63195f48c1bfbf9;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git Merge branch 'upstream-linus' of git://oss.oracle.com/home/sourcebo/git/ocfs2 --- d1ffa5669cd834f901141756e63195f48c1bfbf9