git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 61f6c7a 4ce63fc)
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)
Conflicts:
arch/arm/Kconfig
arch/arm/mm/dma-mapping.c

Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>

Trivial merge
Pandora Kernel Repository