From: Linus Torvalds Date: Wed, 13 Oct 2010 23:51:29 +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=8c35bf368c4e533d07610810e4c3b84c34c8e201;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.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 BUG at fs/nfsd/nfsfh.h:199 on unlink --- 8c35bf368c4e533d07610810e4c3b84c34c8e201