Merge branch 'master'

diff --cc drivers/scsi/libata-core.c
Simple merge

diff --cc drivers/scsi/pdc_adma.c
Simple merge

diff --cc drivers/scsi/sata_mv.c
Simple merge

diff --cc drivers/scsi/sata_nv.c
Simple merge

diff --cc drivers/scsi/sata_promise.c
Simple merge

diff --cc drivers/scsi/sata_qstor.c
Simple merge

diff --cc drivers/scsi/sata_sx4.c
Simple merge

diff --cc drivers/scsi/sata_vsc.c
Simple merge

diff --cc include/linux/ata.h
index 065e91e96c27bce163b53d0b62dd918db0fd93c7,d2873b732bb1255ac08515d21e3ca832f601a058..d54da3306d2c6fe2d614c9862dfae3019dd48e83
--- 1/include/linux/ata.h
--- 2/include/linux/ata.h
+++ b/include/linux/ata.h
@@@ -257,9 -261,7 +262,9 @@@ struct ata_taskfile 
          ((u64) (id)[(n) + 1] << 16) | \
          ((u64) (id)[(n) + 0]) )
  
- static inline int ata_id_current_chs_valid(u16 *id)
 +#define ata_id_cdb_intr(id)   (((id)[0] & 0x60) == 0x20)
 +
+ static inline int ata_id_current_chs_valid(const u16 *id)
  {
        /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 
           has not been issued to the device then the values of 

diff --cc include/linux/libata.h
Simple merge