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: upstream/snapshot3+hdmi~16390 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02412f49f6a7e35753d9af49d92662fb562fc9fa;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git 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 --- 02412f49f6a7e35753d9af49d92662fb562fc9fa