Merge branch 'bugfix' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 18:58:07 +0000 (10:58 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 5 Nov 2009 18:58:07 +0000 (10:58 -0800)
commit9a6fc8d0f8c3ee3d42417e8315fc8c8fae1d3213
treeb4bd15742d56e488592203e1d0a0d07a0684410d
parentd4116f820496ae3af5225d09450edc7791df0045
parent82d6469916c6fcfa345636a49004c9d1753905d1
Merge branch 'bugfix' of git://git./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