]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Dec 2008 19:07:31 +0000 (11:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 20 Dec 2008 19:07:31 +0000 (11:07 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs:
  fs/9p: change simple_strtol to simple_strtoul
  9p: convert d_iname references to d_name.name
  9p: Remove potentially bad parameter from function entry debug print.


Trivial merge