summaryrefslogtreecommitdiffstats
path: root/include/asm-s390/dma.h
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-21 02:46:21 +0200
committerTrond Myklebust <Trond.Myklebust@netapp.com>2006-06-21 02:46:21 +0200
commit70ac4385a13f78bc478f26d317511893741b05bd (patch)
treedafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/asm-s390/dma.h
parentMerge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff)
parentMerge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/... (diff)
downloadlinux-70ac4385a13f78bc478f26d317511893741b05bd.tar.xz
linux-70ac4385a13f78bc478f26d317511893741b05bd.zip
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts: include/linux/nfs_fs.h Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/asm-s390/dma.h')
0 files changed, 0 insertions, 0 deletions