kernel_optimize_test/arch
Tony Lindgren 6f8c9d2130 ARM: OMAP2+: Trivial fix for IOMMU merge issue
Commit 787314c35f ("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>
2012-12-20 14:15:26 -08:00
..
alpha UAPI: (Scripted) Disintegrate arch/alpha/include/asm 2012-12-17 14:12:19 +00:00
arm ARM: OMAP2+: Trivial fix for IOMMU merge issue 2012-12-20 14:15:26 -08:00
arm64 IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
avr32 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2012-12-12 18:07:07 -08:00
blackfin Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lliubbo/blackfin 2012-12-18 10:54:27 -08:00
c6x IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
cris UAPI: Fix up empty files in arch/cris/ 2012-12-20 12:51:25 +01:00
frv frv: properly use the declarations provided by <asm/sections.h> 2012-12-17 17:15:12 -08:00
h8300 UAPI: (Scripted) Disintegrate arch/h8300/include/asm 2012-12-19 16:07:13 +00:00
hexagon Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-12 12:22:13 -08:00
ia64 IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
m32r UAPI: (Scripted) Disintegrate arch/m32r/include/asm 2012-12-19 16:07:18 +00:00
m68k Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu 2012-12-16 17:42:21 -08:00
microblaze IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
mips IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
mn10300 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2012-12-13 12:00:02 -08:00
openrisc Trivial cleanups for OpenRISC. 2012-12-18 10:08:47 -08:00
parisc Nothing all that exciting; a new module-from-fd syscall for those who want 2012-12-19 07:55:08 -08:00
powerpc IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
s390 s390/ccwdev: Include asm/schid.h. 2012-12-17 09:50:34 +01:00
score UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
sh IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
sparc IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
tile IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
um Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 2012-12-17 15:44:47 -08:00
unicore32 Nothing all that exciting; a new module-from-fd syscall for those who want 2012-12-19 07:55:08 -08:00
x86 IOMMU Updates for Linux v3.8 2012-12-20 10:07:25 -08:00
xtensa xtensa: don't try to build DTB when OF is disabled 2012-12-18 21:10:26 -08:00
.gitignore
Kconfig This single patch is effectively a no-op for now. It enables architectures 2012-12-19 07:52:48 -08:00