tree b4bd15742d56e488592203e1d0a0d07a0684410d
parent d4116f820496ae3af5225d09450edc7791df0045
parent 82d6469916c6fcfa345636a49004c9d1753905d1
author Linus Torvalds <torvalds@linux-foundation.org> 1257447487 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1257447487 -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