Merge remote-tracking branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:05:14 +0000 (09:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 8 Sep 2011 14:05:14 +0000 (09:05 -0500)
commit2be9259cd02a095d0c41556bc4a8e15a2d97a1c6
treec0bb1bdd3ec41c5945000cf43620725d2e00ffd8
parent4c87c7d73eca838ea007b1878d1e8a428de38ca6
parent742663c620c00642c518c0f423bf81a492ef04cd
Merge remote-tracking branch 'kwolf/for-anthony' into staging
hw/pflash_cfi01.c
hw/pflash_cfi02.c