The following commit has been merged in the linux branch: commit 9a6fc8d0f8c3ee3d42417e8315fc8c8fae1d3213 Merge: d4116f820496ae3af5225d09450edc7791df0045 82d6469916c6fcfa345636a49004c9d1753905d1 Author: Linus Torvalds torvalds@linux-foundation.org Date: Thu Nov 5 10:58:07 2009 -0800

Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen

* 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen: xen: mask extended topology info in cpuid xen/hvc: make sure console output is always emitted, with explicit polling