tree 57378ccfe0f9fde73081e1f9355d05dd4131e178
parent 16ee792e45cf0c97ce061fce03c36cab5551ec72
parent 97c24c1aa403e0d4ef7c1958db8459e488862b46
author Linus Torvalds <torvalds@linux-foundation.org> 1320204862 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1320204862 -0700

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