Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into next/cleanup2

* 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux:
  ARM: pxa: use common IOMEM definition
  ARM: dma-mapping: convert ARCH_HAS_DMA_SET_COHERENT_MASK to kconfig symbol
This commit is contained in:
Olof Johansson 2012-03-27 16:00:49 -07:00
commit 83b5938ce7
18 changed files with 19 additions and 9 deletions