Merge branch 'devel-stable' into devel
ARM: make struct machine_desc definition coherent with its comment

As mentioned in the comment right at the top, the first four fields
are directly accessed by assembly code in head.S.  Move nr_irqs so the
comment is true again.

Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
arm/debug: consolidate addruart macros for CONFIG_DEBUG_ICEDCC

We have the same (empty) macro for all IDEDCC flavours, so consolidate
it to one.

Signed-off-by: Jeremy Kerr <jeremy.kerr@canonical.com>
Merge commit 'd71e3eb5894dbb626dc7e28cfd4f33ebee9a739a'
Merge commit '1ea64615601229f0dc16dee91dc5b50216411baa'

Conflicts:
	arch/arm/kernel/debug.S