diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 16:08:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-02-04 16:08:15 -0800 |
| commit | a9861b50378ce29212ae2b39ee2d56b2058748cf (patch) | |
| tree | 9ab9d96d909f5d6294dbc6205bd86d053bbc9d0f /arch/arm/mach-u300 | |
| parent | aa16cd8d12352ccb5b921995ab3901110779f24a (diff) | |
| parent | 9b4b351346b41d923d69adec865814fdaac4dba9 (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: Don't clobber the attribute type in nfs_update_inode()
NFS: Fix a umount race
NFS: Fix an Oops when truncating a file
NFS: Ensure that we handle NFS4ERR_STALE_STATEID correctly
NFSv4.1: Don't call nfs4_schedule_state_recovery() unnecessarily
NFSv4: Don't allow posix locking against servers that don't support it
NFSv4: Ensure that the NFSv4 locking can recover from stateid errors
NFS: Avoid warnings when CONFIG_NFS_V4=n
NFS: Make nfs_commitdata_release static
NFS: Try to commit unstable writes in nfs_release_page()
NFS: Fix a reference leak in nfs_wb_cancel_page()
Diffstat (limited to 'arch/arm/mach-u300')
0 files changed, 0 insertions, 0 deletions