Merge branch 'stable-3.2' into pandora-3.2
[pandora-kernel.git] / drivers / s390 / scsi / zfcp_fsf.c
Simple merge