Merge commit '254111ecc80501a7d5c0e82f78bfa5ca8749ae20' into upstream-merge
commit0c42576b3e16c50c601bb4f4a9945d6568c6f455
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:15:35 +0000 (28 11:15 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:15:35 +0000 (28 11:15 +0000)
treef339b2a6dad122cc9af4a983b313a9f1e31a817b
parentaa2623e36a91f5ded5a7b8bead23f5737a7b1855
parent254111ecc80501a7d5c0e82f78bfa5ca8749ae20
Merge commit '254111ecc80501a7d5c0e82f78bfa5ca8749ae20' into upstream-merge

* commit '254111ecc80501a7d5c0e82f78bfa5ca8749ae20':
  rtl8139: use qdev properties for configuration.
  pcnet: split away lance.c (sparc32 code).

Signed-off-by: Mark McLoughlin <markmc@redhat.com>
Makefile.target
hw/pcnet.c