Merge commit 'fbdaa002594c5115c3ff60a7fd5d3e7aa4f845cf' into upstream-merge
commit47cd2d23a65353e12882930bea78b01a4d35e201
authorMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:10:46 +0000 (28 11:10 +0000)
committerMark McLoughlin <markmc@redhat.com>
Wed, 28 Oct 2009 11:10:46 +0000 (28 11:10 +0000)
tree96e396f880b656c024dae04f427927e2b0cfe6f8
parent1132fb26e49f4e7b90a44f890b57a5749b37b4ae
parentfbdaa002594c5115c3ff60a7fd5d3e7aa4f845cf
Merge commit 'fbdaa002594c5115c3ff60a7fd5d3e7aa4f845cf' into upstream-merge

* commit 'fbdaa002594c5115c3ff60a7fd5d3e7aa4f845cf':
  e1000: use qdev properties for configuration.