projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 68ac01a 47c8529)
Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 05:53:41 +0000 (21:53 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 17 Feb 2011 05:53:41 +0000 (21:53 -0800)
* 'for-2.6.38' of git://linux-nfs.org/~bfields/linux:
  nfsd: correctly handle return value from nfsd_map_name_to_*


Trivial merge
John Crispins staging tree