tree fc9c8da8cc4e6cef6d9b28970623ed7a7cd6aaf5
parent c8988f968240069aeae16d8cf9f59096a085eb27
parent 2c39450b39880e162b3eb339672314101f58ee1a
author Linus Torvalds <torvalds@linux-foundation.org> 1213647453 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1213647453 -0700

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.