Merge remote-tracking branch 'aneesh/for-upstream' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Feb 2012 17:19:27 +0000 (11:19 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 27 Feb 2012 17:19:27 +0000 (11:19 -0600)
* aneesh/for-upstream:
  hw/9pfs: Endian fixes for virtfs
  ./configure: add option for disabling VirtFS

1  2 
Makefile
configure

diff --cc Makefile
Simple merge
diff --cc configure
Simple merge