diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 14:24:41 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 14:24:41 -0700 |
| commit | 0d9f9e122c74583de15a86d1c660c08dc298f2c8 (patch) | |
| tree | a04ad387e231db43db112753fa2eae23754189a9 /include/linux/pci_ids.h | |
| parent | df44f9f4f9b5d362b5a2d1c8444fe7e6d4c42653 (diff) | |
| parent | 998db52c03cd293d16a457f1b396cea932244147 (diff) | |
| download | talos-obmc-linux-0d9f9e122c74583de15a86d1c660c08dc298f2c8.tar.gz talos-obmc-linux-0d9f9e122c74583de15a86d1c660c08dc298f2c8.zip | |
Merge branch 'for-2.6.36' of git://linux-nfs.org/~bfields/linux
* 'for-2.6.36' of git://linux-nfs.org/~bfields/linux: (34 commits)
nfsd4: fix file open accounting for RDWR opens
nfsd: don't allow setting maxblksize after svc created
nfsd: initialize nfsd versions before creating svc
net: sunrpc: removed duplicated #include
nfsd41: Fix a crash when a callback is retried
nfsd: fix startup/shutdown order bug
nfsd: minor nfsd read api cleanup
gcc-4.6: nfsd: fix initialized but not read warnings
nfsd4: share file descriptors between stateid's
nfsd4: fix openmode checking on IO using lock stateid
nfsd4: miscellaneous process_open2 cleanup
nfsd4: don't pretend to support write delegations
nfsd: bypass readahead cache when have struct file
nfsd: minor nfsd_svc() cleanup
nfsd: move more into nfsd_startup()
nfsd: just keep single lockd reference for nfsd
nfsd: clean up nfsd_create_serv error handling
nfsd: fix error handling in __write_ports_addxprt
nfsd: fix error handling when starting nfsd with rpcbind down
nfsd4: fix v4 state shutdown error paths
...
Diffstat (limited to 'include/linux/pci_ids.h')
0 files changed, 0 insertions, 0 deletions
