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)
commit02412f49f6a7e35753d9af49d92662fb562fc9fa
treeecf4c573ff8944227ca04e342e97ab17493cda5c
parent4515c3069da5bfb6f08dbfca499464b4cbdfcb50
parent573c24c4af6664ffcd9aa7ba617a35fde2b95534
Merge branch 'for-linus' of git://git./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