From: Linus Torvalds Date: Sun, 15 Apr 2007 04:41:12 +0000 (-0700) Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 X-Git-Tag: firefly_0821_release~30372 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=ff99e40230d5cdf5e48bcdb4938d0626624bc4cb;p=firefly-linux-kernel-4.4.55.git Merge /pub/scm/linux/kernel/git/davem/sparc-2.6 * master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6: [SCSI] QLOGICPTI: Do not unmap DMA unless we actually mapped something. --- ff99e40230d5cdf5e48bcdb4938d0626624bc4cb