Skip to content
Commit 83b5938c authored by Olof Johansson's avatar Olof Johansson
Browse files

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
parents fdd83974 23019a73
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment