tree 61898165882041ef7f9beaf2ef6663a1a4d3c29a
parent 071c06cb570d38efe23a124e885f2f3e643a9206
parent 6ebdc661b608671e9ca572af8bb42d58108cc008
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1267155660 +1100
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1267155660 +1100

Merge commit 'origin/master' into next

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