Merge remote-tracking branch 'stefanha/trivial-patches' into staging
commit711c21280b2cb56060859cc574221a8bf40f908a
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 12 May 2011 13:08:12 +0000 (12 08:08 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 12 May 2011 13:08:12 +0000 (12 08:08 -0500)
tree9f5385c53ac50e613ae34d4165d02460ef993f0f
parent89bb563f6912b3f538d6bdf5833881ed7cdbd923
parent2f172849b63b166fe876aa97b411f63ee7d17467
Merge remote-tracking branch 'stefanha/trivial-patches' into staging

Conflicts:
cpu-all.h
cpu-exec.c
hw/pci.c
target-cris/cpu.h