diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-12-20 14:50:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-20 17:15:26 -0500 |
| commit | 6f8c9d2130893eda35ad9105e6e2a08db7f0da13 (patch) | |
| tree | 3dfcbd88b40daa39184aa03861093c747d227ad1 /kernel/time.c | |
| parent | 982197277c85018cc6eb77f1d3bef17933b0c5fd (diff) | |
ARM: OMAP2+: Trivial fix for IOMMU merge issue
Commit 787314c35fbb ("Merge tag 'iommu-updates-v3.8' of
git://git./linux/kernel/git/joro/iommu") did not account for the changed
header location.
The headers were made local to mach-omap2 as they are specific to omap2+
only, and we wanted to get most of the #include <plat/*.h> headers fixed
up anyways for the ARM multiplatform support.
We attempted to avoid this kind of merge conflict early on by setting up
a minimal git branch shared by the arm-soc tree and the iommu tree, but
looks like we still hit a merge issue there as the branches got merged
as various topic branches.
Cc: Joerg Roedel <joro@8bytes.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/time.c')
0 files changed, 0 insertions, 0 deletions