Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 19:33:40 +0000 (11:33 -0800)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Mon, 22 Jan 2007 19:33:40 +0000 (11:33 -0800)
commit2596627c5c30b45aa206b7b1b864bf00de3c3503
tree28efd5977acccb330afd886c440430e22b8916ae
parent19e805cb040a81dcfbcf2aa8dbe5d9454c5faf2d
parent50af94b14c98f5769860a282a397c6f3b135c8a8
Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  ocfs2: Add backup superblock info to ocfs2_fs.h
  ocfs2: cleanup ocfs2_iget() errors
  ocfs2: Directory c/mtime update fixes
  ocfs2: Don't print errors when following symlinks