Merge remote-tracking branch 'bonzini/nbd-for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Feb 2012 12:50:58 +0000 (06:50 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 17 Feb 2012 12:50:58 +0000 (06:50 -0600)
* bonzini/nbd-for-anthony:
  nbd: add git tree to MAINTAINERS
  open /dev/nbd in nbd_client_thread
  do not chdir(/) in qemu-nbd before opening all files

1  2 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge