diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-01 01:57:18 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-01 01:57:18 +0100 |
commit | 086486e46e4206cfa1140fb9682ad67c8a4502fb (patch) | |
tree | 35624c1b5f89a6b4d2b9e5e0364706165f7f7dd3 /fs/xfs/xfs_log_priv.h | |
parent | Merge tag 'rproc-3.7-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/oh... (diff) | |
parent | CIFS: Fix wrong buffer pointer usage in smb_set_file_info (diff) | |
download | linux-086486e46e4206cfa1140fb9682ad67c8a4502fb.tar.xz linux-086486e46e4206cfa1140fb9682ad67c8a4502fb.zip |
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
Pull CIFS fixes from Steve French:
"Two low risk, small fixes, that fix cifs regressions introduced in
3.7."
* 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
CIFS: Fix wrong buffer pointer usage in smb_set_file_info
cifs: fix writeback race with file that is growing
Diffstat (limited to 'fs/xfs/xfs_log_priv.h')
0 files changed, 0 insertions, 0 deletions