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)
Manual merge of:
drivers/char/hvc_console.c
drivers/char/hvc_console.h


Trivial merge