diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 02:37:51 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 02:37:51 +0300 |
| commit | a6b849578ef3e0b131b1ea4063473a4f935a65e9 (patch) | |
| tree | c91798d44d3cd2c58a973df49031351bcdebefad /MAINTAINERS | |
| parent | 1715ac63d36b52b2932c17bf8ceccf058f02e57b (diff) | |
| parent | 15d987063348c93adb3e7c7378226abea03608e2 (diff) | |
| download | linux-a6b849578ef3e0b131b1ea4063473a4f935a65e9.tar.xz | |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull cifs update from Steve French:
"Mostly cifs cleanup but also a few cifs fixes"
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
cifs: remove unneeded condition check
Set UID in sess_auth_rawntlmssp_authenticate too
cifs: convert printk(LEVEL...) to pr_<level>
cifs: convert to print_hex_dump() instead of custom implementation
cifs: call strtobool instead of custom implementation
Update MAINTAINERS entry
Update modinfo cifs version for cifs.ko
decode_negTokenInit had wrong calling sequence
Add missing defines for ACL query support
Add support for original fallocate
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 0d6469a2cf70..1563a3b38960 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2528,8 +2528,7 @@ M: Steve French <sfrench@samba.org> L: linux-cifs@vger.kernel.org L: samba-technical@lists.samba.org (moderated for non-subscribers) W: http://linux-cifs.samba.org/ -Q: http://patchwork.ozlabs.org/project/linux-cifs-client/list/ -T: git git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git +T: git git://git.samba.org/sfrench/cifs-2.6.git S: Supported F: Documentation/filesystems/cifs/ F: fs/cifs/ |