From: Linus Torvalds Date: Sat, 28 Aug 2010 21:05:55 +0000 (-0700) Subject: Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2547d1d20f3a252567f974de8ce1c572a0815d5a;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux * 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: nfsd: fix NULL dereference in nfsd_statfs() nfsd4: fix downgrade/lock logic nfsd4: typo fix in find_any_file nfsd4: bad BUG() in preprocess_stateid_op --- 2547d1d20f3a252567f974de8ce1c572a0815d5a