diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 23:54:17 +0100 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 23:54:17 +0100 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /lib/iommu-helper.c | |
| parent | Merge branch 'for_3.8/dts_part2' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | ARM: OMAP: Remove omap_init_consistent_dma_size() (diff) | |
| download | linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.tar.xz linux-f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37.zip | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'lib/iommu-helper.c')
0 files changed, 0 insertions, 0 deletions