]> git.baikalelectronics.ru Git - 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)
commit917209347520e0a5ac0ec1ae956013e89bbac188
treecd35351fa453a32ea5bd11089428e35c12049c0b
parent4ad739fd3ab95866827d2ed421e7fe53a5fffffe
parentd174a8638c12152a930de9cd35e7d2d5d988d150
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