diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 01:24:38 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-31 01:24:38 +0200 |
| commit | 10f3cb41d48ab30f5c754b30eea557371892b4c2 (patch) | |
| tree | 55db8e4177da00b6184f5428b4529cd59978e885 /arch/x86/kernel | |
| parent | Merge tag 'for-v3.4-rc1' of git://git.infradead.org/battery-2.6 (diff) | |
| parent | [CIFS] Update CIFS version number to 1.77 (diff) | |
| download | linux-10f3cb41d48ab30f5c754b30eea557371892b4c2.tar.xz linux-10f3cb41d48ab30f5c754b30eea557371892b4c2.zip | |
Merge git://git.samba.org/sfrench/cifs-2.6
Pull cifs fixes from Steve French.
* git://git.samba.org/sfrench/cifs-2.6:
[CIFS] Update CIFS version number to 1.77
CIFS: Add missed forcemand mount option
[CIFS] Fix trivial sparse warning with asyn i/o patch
cifs: handle "sloppy" option appropriately
cifs: use standard token parser for mount options
cifs: remove /proc/fs/cifs/OplockEnabled
cifs: convert cifs_iovec_write to use async writes
cifs: call cifs_update_eof with i_lock held
cifs: abstract out function to marshal up the iovec array for async writes
cifs: fix up get_numpages
cifs: make cifsFileInfo_get return the cifsFileInfo pointer
cifs: fix allocation in cifs_write_allocate_pages
cifs: allow caller to specify completion op when allocating writedata
cifs: add pid field to cifs_writedata
cifs: add new cifsiod_wq workqueue
CIFS: Change mid_q_entry structure fields
CIFS: Expand CurrentMid field
CIFS: Separate protocol-specific code from cifs_readv_receive code
CIFS: Separate protocol-specific code from demultiplex code
CIFS: Separate protocol-specific code from transport routines
Diffstat (limited to 'arch/x86/kernel')
0 files changed, 0 insertions, 0 deletions