Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Oct 2012 01:48:32 +0000 (10:48 +0900)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 10 Oct 2012 01:48:32 +0000 (10:48 +0900)
commitfc81c038c2d61d4fcd8150f383fec1ce23087597
treebc0b5156a97bb4ba6d4ab96906faaf4255b45ba5
parent547b1e81afe3119f7daf702cc03b158495535a25
parent72bd481f860f0125c810bb43d878ce5f9c060c58
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6

Pull CIFS fixes from Steve French.

* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
  cifs: reinstate the forcegid option
  Convert properly UTF-8 to UTF-16
  [CIFS] WARN_ON_ONCE if kernel_sendmsg() returns -ENOSPC