diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-18 21:21:25 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-06-18 21:21:25 +0200 |
commit | 67f5d06d732f591449a48242d40928f59d39287d (patch) | |
tree | 9ca561cedb0ca6985cecaf494481740ab8f434b4 /net/rose | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 (diff) | |
parent | 9p: BUG before corrupting memory (diff) | |
download | linux-67f5d06d732f591449a48242d40928f59d39287d.tar.xz linux-67f5d06d732f591449a48242d40928f59d39287d.zip |
Merge branch 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs
Pull a 9p bugfix from Eric Van Hensbergen.
* 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
9p: BUG before corrupting memory
Diffstat (limited to 'net/rose')
0 files changed, 0 insertions, 0 deletions