Merge commit '93db66850d99fd9885edeff6af5679be51e1c610' into upstream-merge
commit3deaf5aa6ab23d2f8b0250ea63908a30ff2726af
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 10:55:42 +0000 (28 10:55 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 10:55:42 +0000 (28 10:55 +0000)
tree5109988bec768a066a9b7b39f4411f422b3f67b3
parent492fcd3f081d5f297919554aa092d744632e5a7c
parent93db66850d99fd9885edeff6af5679be51e1c610
Merge commit '93db66850d99fd9885edeff6af5679be51e1c610' into upstream-merge

* commit '93db66850d99fd9885edeff6af5679be51e1c610': (81 commits)
  ne2k_isa: use qdev properties for configuration.
  qdev/net: common nic property bits
  qdev: add vlan property
  qdev: add netdev property
  qdev: mac addr property fixups
  net: add macaddr type.
  Send a RARP packet after migration.
  multiboot.S patch for old as(1) (was: Re: [Qemu-devel] Some OpenBSD/amd64 build fixes)
  raw/linux-aio: Also initialize POSIX AIO
  qcow2: Fix grow_refcount_table error handling
  usb-linux: return USB_RET_STALL on -EPIPE
  Makefile: Change make to be quiet again when doing nothing
  eepro100: Restructure code
  target-arm: use native tcg-ops for ror/bic/vorn
  target-arm: fix neon shift helper functions
  target-arm: fix neon vsri, vshl and vsli ops
  target-arm: allow modifying vfp fpexc en bit only
  target-arm: add support for neon vld1.64/vst1.64 instructions
  target-arm: fix neon vshrn/vrshrn ops
  target-arm: fix incorrect temporary variable freeing
  ...

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
12 files changed:
Makefile
block/raw-posix.c
configure
cpu-exec.c
gdbstub.c
monitor.c
net.c
net.h
qemu-common.h
savevm.c
target-i386/machine.c
target-ppc/cpu.h