diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 18:47:49 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-07-22 18:47:49 +0200 |
commit | 12e8ffe35eaca1411afc1f3124478f8e2b65eedc (patch) | |
tree | edf463e4744c30fa223f76f30686a49d233d0c9e /drivers/net/sunbmac.h | |
parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiw... (diff) | |
parent | NFSv4: Fix a problem whereby a buggy server can oops the kernel (diff) | |
download | linux-12e8ffe35eaca1411afc1f3124478f8e2b65eedc.tar.xz linux-12e8ffe35eaca1411afc1f3124478f8e2b65eedc.zip |
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6:
NFSv4: Fix a problem whereby a buggy server can oops the kernel
NFSv4: Fix an NFSv4 mount regression
NFSv4: Fix an Oops in nfs4_free_lock_state
Diffstat (limited to 'drivers/net/sunbmac.h')
0 files changed, 0 insertions, 0 deletions