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: daily-2014.03.25.0_l4t/l4t-r19.1~22289 X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=02412f49f6a7e35753d9af49d92662fb562fc9fa 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