From: Linus Torvalds Date: Fri, 7 May 2010 20:59:48 +0000 (-0700) Subject: Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 X-Git-Tag: MMI-PSA29.97-13-9~23999 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=91677467163b847f1a5497789a893ada97f375b6;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6 * 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6: NFS: Fix RCU issues in the NFSv4 delegation code NFSv4: Fix the locking in nfs_inode_reclaim_delegation() --- 91677467163b847f1a5497789a893ada97f375b6