diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-22 08:55:43 +0200 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2012-05-22 08:55:43 +0200 |
| commit | 0f51596bd39a5c928307ffcffc9ba07f90f42a8b (patch) | |
| tree | b636403815316ecad2170092b70f1079df260a95 /arch/arm/mm/init.c | |
| parent | 61f6c7a47a2f84b7ba4b65240ffe9247df772b06 (diff) | |
| parent | 4ce63fcd919c32d22528e54dcd89506962933719 (diff) | |
| download | blackbird-op-linux-0f51596bd39a5c928307ffcffc9ba07f90f42a8b.tar.gz blackbird-op-linux-0f51596bd39a5c928307ffcffc9ba07f90f42a8b.zip | |
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>
Diffstat (limited to 'arch/arm/mm/init.c')
0 files changed, 0 insertions, 0 deletions
