]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'misc' into devel
authorRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:32:52 +0000 (22:32 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Thu, 6 Jan 2011 22:32:52 +0000 (22:32 +0000)
commit4073723acb9cdcdbe4df9c0e0c376c65d1697e43
treef41c17eac157b1223ce104845cf9b1e5a9e6a83d
parent58daf18cdcab550262a5f4681e1f1e073e21965a
parent4ec3eb13634529c0bc7466658d84d0bbe3244aea
Merge branch 'misc' into devel

Conflicts:
arch/arm/Kconfig
arch/arm/common/Makefile
arch/arm/kernel/Makefile
arch/arm/kernel/smp.c
32 files changed:
arch/arm/Kconfig
arch/arm/Kconfig.debug
arch/arm/include/asm/system.h
arch/arm/include/asm/traps.h
arch/arm/kernel/Makefile
arch/arm/kernel/entry-armv.S
arch/arm/kernel/head.S
arch/arm/kernel/irq.c
arch/arm/kernel/smp.c
arch/arm/kernel/smp_twd.c
arch/arm/kernel/vmlinux.lds.S
arch/arm/mach-bcmring/core.c
arch/arm/mach-integrator/integrator_cp.c
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-pxa/Kconfig
arch/arm/mach-realview/core.c
arch/arm/mach-realview/platsmp.c
arch/arm/mach-s3c2412/Kconfig
arch/arm/mach-s5pv310/include/mach/smp.h
arch/arm/mach-s5pv310/platsmp.c
arch/arm/mach-tegra/platsmp.c
arch/arm/mach-ux500/platsmp.c
arch/arm/mach-versatile/core.c
arch/arm/mach-vexpress/ct-ca9x4.c
arch/arm/mach-vexpress/platsmp.c
arch/arm/mach-vexpress/v2m.c
arch/arm/mm/dma-mapping.c
arch/arm/mm/proc-macros.S
arch/arm/mm/proc-v7.S
arch/sh/Kconfig
arch/sh/kernel/cpu/sh4/clock-sh4-202.c
arch/sh/kernel/cpu/sh4a/clock-sh7724.c