git.baikalelectronics.ru Git - kernel.git/commit

Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc

* 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc:
  arm/imx: use Kconfig choice for low-level debug UART selection
  ARM: realview: use Kconfig choice for debug UART selection
  ARM: plat-samsung: use Kconfig choice for debug UART selection
  ARM: versatile: convert logical CPU numbers to physical numbers
  ARM: ux500: convert logical CPU numbers to physical numbers
  ARM: shmobile: convert logical CPU numbers to physical numbers
  ARM: msm: convert logical CPU numbers to physical numbers
  ARM: exynos4: convert logical CPU numbers to physical numbers

Fix up trivial conflict (config DEBUG_S3C_UART move/split vs addition of
ARM_KPROBES_TEST option) in arch/arm/Kconfig.debug

author	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 2 Nov 2011 03:34:22 +0000 (20:34 -0700)
committer	Linus Torvalds <torvalds@linux-foundation.org>
	Wed, 2 Nov 2011 03:34:22 +0000 (20:34 -0700)
commit	c564ebccd76fad03b26b463d62908f9c0497bb41
tree	57378ccfe0f9fde73081e1f9355d05dd4131e178	tree \| snapshot
parent	9cee1e316e6b093a6d089ebb4c8ae99d2b793af7	commit \| diff
parent	eb6a96aaec48c90ce684a4e2211ea42d564cec6e	commit \| diff

arch/arm/Kconfig.debug	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-exynos4/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-msm/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-mxs/include/mach/debug-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-realview/include/mach/debug-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-ux500/platsmp.c	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-vexpress/hotplug.c	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-mxc/include/mach/debug-macro.S	diff1 \|	diff2 \|	blob \| history
arch/arm/plat-samsung/Kconfig	diff1 \|	diff2 \|	blob \| history