Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
authorLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 15 Apr 2007 04:41:12 +0000 (21:41 -0700)
committerLinus Torvalds <torvalds@woody.linux-foundation.org>
Sun, 15 Apr 2007 04:41:12 +0000 (21:41 -0700)
commitff99e40230d5cdf5e48bcdb4938d0626624bc4cb
tree9ea67e1d7f44db9704aa4f39df08452d24119820
parent2951157f054039fa4f19b4c05fbf206b7f9d2eec
parent8d3ee2cb0ab59f78fdc801ede7db15ef47387bd0
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.