tree ecf4c573ff8944227ca04e342e97ab17493cda5c
parent 4515c3069da5bfb6f08dbfca499464b4cbdfcb50
parent 573c24c4af6664ffcd9aa7ba617a35fde2b95534
author Linus Torvalds <torvalds@linux-foundation.org> 1260466439 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260466439 -0800

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