Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:38:21 +0000 (14:38 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 7 Sep 2010 21:38:21 +0000 (14:38 -0700)
commit3c5dff7b5ec7ac1bf356d43ac37e2e4ec7ec063a
tree1d6be67bfc1175333279da5934805be3921182b0
parentdc6f962eb5ad728086fcfa9967976e93ed68e0a5
parent8f587df479c3cea14ba1a9b9d58f34fd2fd6d58b
Merge branch 'for-linus' of git://git./linux/kernel/git/ericvh/v9fs

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  9p: potential ERR_PTR() dereference