[Linaro-mm-sig] [GIT PULL] DMA-mapping fixups for v3.6-rc2