projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fdd8397 23019a7)
Merge branch 'io-cleanup-for-3.4' of git://sources.calxeda.com/kernel/linux into...
authorOlof Johansson <olof@lixom.net>
Tue, 27 Mar 2012 23:00:49 +0000 (16:00 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 27 Mar 2012 23:00:49 +0000 (16:00 -0700)
* '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


Trivial merge