| commit | 086486e46e4206cfa1140fb9682ad67c8a4502fb | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 30 16:57:18 2012 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Nov 30 16:57:18 2012 -0800 |
| tree | 35624c1b5f89a6b4d2b9e5e0364706165f7f7dd3 | |
| parent | a95251b8bac4a91a43db795a7193545dac65f4f4 [diff] | |
| parent | c772aa92b6deb2857d4b39a5cc3bd3679cc5f4a6 [diff] |
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