tree a8de1b2d889258ddf2283402252f7a5e77be6445
parent bb9f3dd394dfd3bdac45459e161c34e9b21f0497
parent 319ba9f52737fc79de5c2c6abd059933398b72d5
author Avi Kivity <avi@redhat.com> 1330437247 +0200
committer Avi Kivity <avi@redhat.com> 1330437247 +0200

Merge commit '319ba9f52737fc79de5c2c6abd059933398b72d5' into upstream-merge

* commit '319ba9f52737fc79de5c2c6abd059933398b72d5':
  i8254: Pass alternative IRQ output object on initialization

Conflicts:
	hw/i8254.c

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