summaryrefslogtreecommitdiffstats
path: root/arch/um/include/asm/apic.h
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-11-02 02:46:55 +0100
committerArnd Bergmann <arnd@arndb.de>2011-11-02 02:46:55 +0100
commitabc3f126ac736280c68db6472eb0040ddf6e1b1f (patch)
tree4e3333cde6da6c49dcd81920410bf5a33055f03a /arch/um/include/asm/apic.h
parentb8df0ea26ac17c9a073f235c7fdfbdd1851b59ea (diff)
parent8bcb97659656042f3132b2814b19709856aa1335 (diff)
downloadlinux-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.gz
linux-abc3f126ac736280c68db6472eb0040ddf6e1b1f.tar.bz2
linux-abc3f126ac736280c68db6472eb0040ddf6e1b1f.zip
Merge branch 'imx/imx6q' into next/soc
Conflicts: Documentation/devicetree/bindings/arm/fsl.txt arch/arm/Kconfig arch/arm/Kconfig.debug arch/arm/plat-mxc/include/mach/common.h
Diffstat (limited to 'arch/um/include/asm/apic.h')
0 files changed, 0 insertions, 0 deletions