Merge commit 'origin/master' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 26 Feb 2010 03:41:00 +0000 (14:41 +1100)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 26 Feb 2010 03:41:00 +0000 (14:41 +1100)
commit874f2f997dbe041a6c6e509dae8656ed9022d65d
tree61898165882041ef7f9beaf2ef6663a1a4d3c29a
parent071c06cb570d38efe23a124e885f2f3e643a9206
parent6ebdc661b608671e9ca572af8bb42d58108cc008
Merge commit 'origin/master' into next

Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h
arch/powerpc/Kconfig
arch/powerpc/platforms/85xx/mpc85xx_mds.c
arch/powerpc/platforms/powermac/feature.c