diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-08-18 18:24:38 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-08-18 18:24:38 +0100 |
| commit | 073fd73e566c711f5c0cdaa300fdd1a3c8e7faa0 (patch) | |
| tree | ed221783760dc3733384087a4ae9fc4c5dbe3525 /VERSION | |
| parent | 08ab59770da57648bfb8fc9be37f0ef7fb50b0f9 (diff) | |
| parent | d0a0bfe6729ef6044d76ea49fafa07e29fa598bd (diff) | |
Merge remote-tracking branch 'remotes/amit/for-2.2' into staging
* remotes/amit/for-2.2:
virtio-serial: search for duplicate port names before adding new ports
virtio-serial: create a linked list of all active devices
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'VERSION')
0 files changed, 0 insertions, 0 deletions