Merge branch 'master'
[pandora-kernel.git] / drivers / scsi / sata_nv.c
Simple merge