diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-22 04:20:38 +0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-22 04:20:38 +0400 |
| commit | 147f1404db3ed0c3019002eef693c5d297b8f161 (patch) | |
| tree | 7349fe8111e2ba8ee7a9aba69ec8893a69d8a573 /drivers/acpi/device_pm.c | |
| parent | 401c58fcbbf570e7e4a8ee0e21ffd829deb4de0b (diff) | |
| parent | f41c5ad2ff2657978a9712b9ea80cd812a7da2b0 (diff) | |
| download | linux-147f1404db3ed0c3019002eef693c5d297b8f161.tar.xz | |
Merge branch 'for-3.16' of git://linux-nfs.org/~bfields/linux
Pull nfsd bugfixes from Bruce Fields:
"Fixes for a new regression from the xdr encoding rewrite, and a
delegation problem we've had for a while (made somewhat more annoying
by the vfs delegation support added in 3.13)"
* 'for-3.16' of git://linux-nfs.org/~bfields/linux:
NFSD: fix bug for readdir of pseudofs
NFSD: Don't hand out delegations for 30 seconds after recalling them.
Diffstat (limited to 'drivers/acpi/device_pm.c')
0 files changed, 0 insertions, 0 deletions