From: Linus Torvalds <torvalds@woody.linux-foundation.org>
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: v2.6.21-rc7~7
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff99e40230d5cdf5e48bcdb4938d0626624bc4cb;p=linux-2.6

Merge master.kernel.org:/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