| commit | 9c488de24f7264f08d341024bffdd637b4d04c96 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 14 12:49:15 2015 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Sep 14 12:49:15 2015 -0700 |
| tree | a644ba6ccaed95729b121a1ccd269ace4e383b33 | |
| parent | 57e6bbcb4beb4c87aa93e78a1db08fdaab9ee65f [diff] | |
| parent | eda2116f4ab6d79cfcffc202b5d2bbb0797ba013 [diff] |
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 Pull CIFS fixes from Steve French: "Two small cifs fixes" * 'for-next' of git://git.samba.org/sfrench/cifs-2.6: [CIFS] mount option sec=none not displayed properly in /proc/mounts CIFS: fix type confusion in copy offload ioctl