Merge branch 'for-next-arm-dma' into for-linus
authorMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 22 May 2012 06:55:43 +0000 (08:55 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Tue, 22 May 2012 06:55:43 +0000 (08:55 +0200)
commit0f51596bd39a5c928307ffcffc9ba07f90f42a8b
treeb636403815316ecad2170092b70f1079df260a95
parent61f6c7a47a2f84b7ba4b65240ffe9247df772b06
parent4ce63fcd919c32d22528e54dcd89506962933719
Merge branch 'for-next-arm-dma' into for-linus

Conflicts:
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c