projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c80c71 910ac68)
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:47:13 +0000 (22:47 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 19 Aug 2011 05:47:13 +0000 (22:47 -0700)
* 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
  NFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets
  NFSv4.1: Fix the callback 'highest_used_slotid' behaviour
  pnfs-obj: Fix the comp_index != 0 case
  pnfs-obj: Bug when we are running out of bio
  nfs: add missing prefetch.h include


Trivial merge
John Crispins staging tree