]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2015 19:49:15 +0000 (12:49 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 14 Sep 2015 19:49:15 +0000 (12:49 -0700)
commit9c488de24f7264f08d341024bffdd637b4d04c96
treea644ba6ccaed95729b121a1ccd269ace4e383b33
parent57e6bbcb4beb4c87aa93e78a1db08fdaab9ee65f
parenteda2116f4ab6d79cfcffc202b5d2bbb0797ba013
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