diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:07:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-23 17:07:15 +0100 |
| commit | 1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5 (patch) | |
| tree | c6684be0e98deb7220153c410be7c1fb7cb0dbbf /fs/xfs/xfs_aops.h | |
| parent | Merge tag 'nfs-for-3.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs (diff) | |
| parent | cifs: clean up ordering in exit_cifs (diff) | |
| download | linux-1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5.tar.xz linux-1c3ddfe5ab886c4dc0443535e95ad8e41c41d0e5.zip | |
Merge git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French
* git://git.samba.org/sfrench/cifs-2.6:
cifs: clean up ordering in exit_cifs
cifs: clean up call to cifs_dfs_release_automount_timer()
CIFS: Delete echo_retries module parm
CIFS: Prepare credits code for a slot reservation
CIFS: Make wait_for_free_request killable
CIFS: Introduce credit-based flow control
CIFS: Simplify inFlight logic
cifs: fix issue mounting of DFS ROOT when redirecting from one domain controller to the next
CIFS: Respect negotiated MaxMpxCount
CIFS: Fix a spurious error in cifs_push_posix_locks
Diffstat (limited to 'fs/xfs/xfs_aops.h')
0 files changed, 0 insertions, 0 deletions