| commit | 91677467163b847f1a5497789a893ada97f375b6 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 07 13:59:48 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri May 07 13:59:48 2010 -0700 |
| tree | 2b505e413ad1fd2f5237b968747a87a7e9983695 | |
| parent | 4a2253313653bcc4126287818b676f95ac26dc09 [diff] | |
| parent | 17d2c0a0c4d4e074f0a2a5c0090ff6d88f5e1d44 [diff] |
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()