diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-28 23:32:06 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-28 23:32:06 +0300 |
| commit | 9f76628da20f96a179ca62b504886f99ecc29223 (patch) | |
| tree | 0557dab127d1650294565f824466ff6032dbb876 /drivers/watchdog | |
| parent | 6234056e1380e72f316546cba13d0f8f09b29789 (diff) | |
| parent | 51904b08072a8bf2b9ed74d1bd7a5300a614471d (diff) | |
| download | linux-9f76628da20f96a179ca62b504886f99ecc29223.tar.xz | |
Merge branch 'for-3.18' of git://linux-nfs.org/~bfields/linux
Pull two nfsd fixes from Bruce Fields:
"One regression from the 3.16 xdr rewrite, one an older bug exposed by
a separate bug in the client's new SEEK code"
* 'for-3.18' of git://linux-nfs.org/~bfields/linux:
nfsd4: fix crash on unknown operation number
nfsd4: fix response size estimation for OP_SEQUENCE
Diffstat (limited to 'drivers/watchdog')
0 files changed, 0 insertions, 0 deletions