]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 14:28:02 +0000 (07:28 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 May 2010 14:28:02 +0000 (07:28 -0700)
commite90e4d9234c953b29267cc4fc9ad804128773313
treecd35351fa453a32ea5bd11089428e35c12049c0b
parent05ec7dd8dd5aa42c22a49682e4a51cadd4166b7e
parent89d799d008710e048ee14df4f4e5441e9f4d5d50
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm:
  dlm: fix ast ordering for user locks
  dlm: cleanup remove unused code