Merge commit '7622483395ef0e6c415af74bc9e7b0edf59cfe6c' into upstream-merge
commit73381a9478b9c1d761bfaa882de82d71c75ee7df
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:13:28 +0000 (28 11:13 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:13:28 +0000 (28 11:13 +0000)
treeeb732ac5a88996a0f3db2575470595aa1c1bcb95
parentac1ae73a34d050abcac5feac20626d346f7869e1
parent7622483395ef0e6c415af74bc9e7b0edf59cfe6c
Merge commit '7622483395ef0e6c415af74bc9e7b0edf59cfe6c' into upstream-merge

* commit '7622483395ef0e6c415af74bc9e7b0edf59cfe6c':
  pcnet: use qdev properties for configuration.

Signed-off-by: Mark McLoughlin <markmc@redhat.com>