Auto-update from upstream

diff --cc arch/parisc/kernel/pci-dma.c
Simple merge

diff --cc drivers/parisc/ccio-dma.c
Simple merge

diff --cc drivers/parisc/sba_iommu.c
Simple merge