projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 48d4e13 5fcb08b)
Merge branch 'v9fs-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 19:21:25 +0000 (12:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 18 Jun 2012 19:21:25 +0000 (12:21 -0700)
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


Trivial merge
John Crispins staging tree