]> git.kernelconcepts.de Git - karo-tx-linux.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)
commitc629eaf8392b676b4f83c3dc344e66402bfeec92
tree5edd51bb94b7b83ddf3c3c2793c0a6a1ac671e9c
parent4bbbf13fd55a9817452533934dee489683e703b8
parent28f8881023c9713c303c0feda270929f9384c019
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