| commit | f7d8f1e9cb44e6ee1602586dbf7f2bed637a2b4e | [log] [tgz] |
|---|---|---|
| author | Marek Szyprowski <m.szyprowski@samsung.com> | Mon Jul 15 11:13:54 2013 +0200 |
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | Mon Jul 15 11:13:54 2013 +0200 |
| tree | c56a58601b743997051a94532d4cb9b27f9a4635 | |
| parent | ad81f0545ef01ea651886dddac4bef6cec930092 [diff] | |
| parent | f825c736e75b11adb59ec52a4a1096efddd2ec97 [diff] |
Merge remote-tracking branch 'dma-public/for-v3.12-cma-dma' into for-next Conflicts: mm/Kconfig Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>