]> 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>
Thu, 10 Dec 2009 17:33:59 +0000 (09:33 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Dec 2009 17:33:59 +0000 (09:33 -0800)
commit4dfb5c9608d65ee31bed47cea1b1e6dd97a40b58
treeecf4c573ff8944227ca04e342e97ab17493cda5c
parentaee5e3d0b8d136275ce864cbdb257dad9310a8be
parentaeb080d05754a1cef50117bc14bafe50db5f28b5
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: always use GFP_NOFS
fs/dlm/plock.c