]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2010 21:04:53 +0000 (13:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 14 Nov 2010 21:04:53 +0000 (13:04 -0800)
commit1ca7318cacdac5262492149cf46abc06c95693fa
treec8532b1cd52ab4858a7550b8e2dd0cb1f5a1eb03
parent0143832cc96d0bf78486297aad5c8fb2c2ead02a
parent1c66b360fe26204e2aa14e45086b4a6b8890b1a2
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2:
  ocfs2: Change some lock status member in ocfs2_lock_res to char.