Merge commit 'origin/master' into next
Benjamin Herrenschmidt [Fri, 26 Feb 2010 03:41:00 +0000 (14:41 +1100)]
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h

1  2 
arch/powerpc/Kconfig
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/powermac/feature.c

Simple merge