From: Linus Torvalds Date: Thu, 10 Dec 2009 17:33:59 +0000 (-0800) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm X-Git-Tag: v2.6.33-rc1~329 X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/02412f49f6a7e35753d9af49d92662fb562fc9fa?hp=--cc 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 --- 02412f49f6a7e35753d9af49d92662fb562fc9fa