Merge remote-tracking branch 'stefanha/trivial-patches-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Dec 2011 13:59:21 +0000 (07:59 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Dec 2011 13:59:21 +0000 (07:59 -0600)
1  2 
Makefile.target
configure
cpus.c
hmp-commands.hx
hw/arm_gic.c
hw/eepro100.c
hw/rtl8139.c
migration.h
net/socket.c
qapi-schema-guest.json
qerror.c

diff --cc Makefile.target
Simple merge
diff --cc configure
Simple merge
diff --cc cpus.c
Simple merge
diff --cc hmp-commands.hx
Simple merge
diff --cc hw/arm_gic.c
Simple merge
diff --cc hw/eepro100.c
Simple merge
diff --cc hw/rtl8139.c
Simple merge
diff --cc migration.h
Simple merge
diff --cc net/socket.c
Simple merge
Simple merge
diff --cc qerror.c
Simple merge