git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ad81f05 f825c73)
Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next
authorMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 15 Jul 2013 09:13:54 +0000 (11:13 +0200)
committerMarek Szyprowski <m.szyprowski@samsung.com>
Mon, 15 Jul 2013 09:13:54 +0000 (11:13 +0200)
Conflicts:
mm/Kconfig

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

Trivial merge
Pandora Kernel Repository