diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 01:48:32 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-10 01:48:32 (GMT) |
| commit | fc81c038c2d61d4fcd8150f383fec1ce23087597 (patch) | |
| tree | bc0b5156a97bb4ba6d4ab96906faaf4255b45ba5 /fs/btrfs/delayed-inode.c | |
| parent | 547b1e81afe3119f7daf702cc03b158495535a25 (diff) | |
| parent | 72bd481f860f0125c810bb43d878ce5f9c060c58 (diff) | |
| download | linux-fsl-qoriq-fc81c038c2d61d4fcd8150f383fec1ce23087597.tar.xz | |
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
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
0 files changed, 0 insertions, 0 deletions