]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2012 03:56:54 +0000 (20:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 28 Apr 2012 03:56:54 +0000 (20:56 -0700)
commitb2c9aea312c6b60e299e18dd9decf21d1b44f8cb
tree5edd51bb94b7b83ddf3c3c2793c0a6a1ac671e9c
parent4a1f636c2faa3789e758784d945f746d149eec47
parentb428cff1ea5996b363579c2fcdbe8120edb165ae
Merge git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French.

* git://git.samba.org/sfrench/cifs-2.6:
  Use correct conversion specifiers in cifs_show_options
  CIFS: Show backupuid/gid in /proc/mounts
  cifs: fix offset handling in cifs_iovec_write