Merge commit 'origin/master' into next

Manual merge of:
	drivers/char/hvc_console.c
	drivers/char/hvc_console.h

diff --cc arch/powerpc/Kconfig
Simple merge

diff --cc arch/powerpc/platforms/85xx/mpc85xx_mds.c
Simple merge

diff --cc arch/powerpc/platforms/powermac/feature.c
Simple merge