]> 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)
commit4c79667ab5f8056af705932be9c1c03b8716b7bf
tree5edd51bb94b7b83ddf3c3c2793c0a6a1ac671e9c
parent74926fe7b287f4789287230635c8c9f3ff03a2ab
parente1bd0c82bc618d291ea5f6dd209c8b50fac7d869
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