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