Peter Lieven 8cb369b87f Merge remote-tracking branch 'upstream-git/master' ...

Conflicts:
	include/iscsi-private.h
	include/iscsi.h
	lib/connect.c
	lib/init.c
	lib/scsi-lowlevel.c

2012-11-12 16:02:57 +01:00

13 KiB

Raw Blame History

View Raw