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