summaryrefslogtreecommitdiffstats
path: root/drivers/dma
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-19 07:47:13 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-19 07:47:13 +0200
commit35a21b429917baf86d7595826e7314662ec09d0a (patch)
treeb60e4451fe84fe113fbb98ef09733cd2071998bb /drivers/dma
parentMerge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mas... (diff)
parentNFSv4.1: Return NFS4ERR_BADSESSION to callbacks during session resets (diff)
downloadlinux-35a21b429917baf86d7595826e7314662ec09d0a.tar.xz
linux-35a21b429917baf86d7595826e7314662ec09d0a.zip
Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
* '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
Diffstat (limited to 'drivers/dma')
0 files changed, 0 insertions, 0 deletions