diff options
| author | Joerg Roedel | 2012-12-16 12:24:09 +0100 |
|---|---|---|
| committer | Joerg Roedel | 2012-12-16 12:24:09 +0100 |
| commit | 9c6ecf6a3ade2dc4b03a239af68058b22897af41 (patch) | |
| tree | fe8345ddac388c832f6438e7a074c3c0d1837d6f /arch/arm/mach-ixp4xx/goramo_mlr.c | |
| parent | 29594404d7fe73cd80eaa4ee8c43dcc53970c60e (diff) | |
| parent | a0157573041403e7507a6f3f32279fc14ff5c02e (diff) | |
| parent | 310aa95078443c7b7b56c60dbc55b7a11b946edb (diff) | |
| parent | ea2447f700cab264019b52e2b417d689e052dcfd (diff) | |
| parent | f1bda29c2bfa84c2c022e1f443528e21607bf360 (diff) | |
| parent | 298ea44f211de93ce1b30dc4e2bd2d3b23e41556 (diff) | |
Merge branches 'iommu/fixes', 'dma-debug', 'x86/amd', 'x86/vt-d', 'arm/tegra' and 'arm/omap' into next