]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Dec 2008 02:56:55 +0000 (18:56 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 2 Dec 2008 02:56:55 +0000 (18:56 -0800)
commit7b82168a8f6754e1d9df83a115d044866bca9393
tree0fc5f05fb578e3499182f27f63787a9df8e77a43
parentf1eda2d5df79d37cd01db3173dfc1b4a30b1c7f5
parentff6ae28a3b9535b98e6a6b132e091ed5c206c631
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