]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c8988f9 2c39450)
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jun 2008 20:17:33 +0000 (13:17 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 16 Jun 2008 20:17:33 +0000 (13:17 -0700)
commit27eaf66b05687a27aaca0c0b9014c2f5c23bd18c
treefc9c8da8cc4e6cef6d9b28970623ed7a7cd6aaf5tree | snapshot
parentc8988f968240069aeae16d8cf9f59096a085eb27commit | diff
parent2c39450b39880e162b3eb339672314101f58ee1acommit | diff
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: Remove ->hangup() from stack glue operations.
  ocfs2: Move the call of ocfs2_hb_ctl into the stack glue.
  ocfs2: Move the hb_ctl_path sysctl into the stack glue.
Linux 2.6 source tree