tree d9408eaf4bcbb2174fc83d8726ddae6d0b810cf6
parent f91d8a2904e491373429d107c2c6d69ab3a5c0a7
parent ce967e2f33861b0e17753f97fa4527b5943c94b6
author Avi Kivity <avi@redhat.com> 1330507617 +0200
committer Avi Kivity <avi@redhat.com> 1330507617 +0200

Merge commit 'ce967e2f33861b0e17753f97fa4527b5943c94b6' into upstream-merge

* commit 'ce967e2f33861b0e17753f97fa4527b5943c94b6':
  i8254: Rework & fix interaction with HPET in legacy mode

Conflicts:
	hw/i8254.c

Signed-off-by: Avi Kivity <avi@redhat.com>