From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 28 Apr 2012 03:56:54 +0000 (-0700)
Subject: Merge git://git.samba.org/sfrench/cifs-2.6
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c629eaf8392b676b4f83c3dc344e66402bfeec92;p=~shefty%2Frdma-dev.git

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
---

c629eaf8392b676b4f83c3dc344e66402bfeec92