Merge remote-tracking branch 'bonzini/scsi-next' into staging
authorAnthony Liguori <aliguori@amazon.com>
Fri, 10 Jan 2014 19:05:17 +0000 (11:05 -0800)
committerAnthony Liguori <aliguori@amazon.com>
Fri, 10 Jan 2014 19:05:17 +0000 (11:05 -0800)
* bonzini/scsi-next:
  scsi-disk: add UNMAP limits to block limits VPD page
  block/iscsi: use a bh to schedule co reentrance

Message-id: 1387720926-11421-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@amazon.com>
1  2 
block/iscsi.c

diff --cc block/iscsi.c
Simple merge