diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-26 09:37:19 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-26 09:37:19 -0700 |
commit | aada1bc92797434cdf31e76fc2c6ab29307a5f48 (patch) | |
tree | 8a58648fa4a07bb94a615744bcbea07c0d0135e5 /fs/minix/minix.h | |
parent | 7e0d8a838834beb2cce9df48dacf67f4e8e699cb (diff) | |
parent | 71a394faaad07090af5de5c075ec2f5bca0fbb35 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6:
[CIFS] remove unknown mount option warning message
[CIFS] remove bkl usage from umount begin
cifs: Fix incorrect return code being printed in cFYI messages
[CIFS] cleanup asn handling for ntlmssp
[CIFS] Copy struct *after* setting the port, instead of before.
cifs: remove rw/ro options
cifs: fix problems with earlier patches
cifs: have cifs parse scope_id out of IPv6 addresses and use it
[CIFS] Do not send tree disconnect if session is already disconnected
[CIFS] Fix build break
cifs: display scopeid in /proc/mounts
cifs: add new routine for converting AF_INET and AF_INET6 addrs
cifs: have cifs_show_options show forceuid/forcegid options
cifs: remove unneeded NULL checks from cifs_show_options
Diffstat (limited to 'fs/minix/minix.h')
0 files changed, 0 insertions, 0 deletions