Merge branch 'tmp'

diff --cc drivers/scsi/libata-core.c
index 857f535c81904f16d7305930a74e0b88cf35589a,15df633521d006d164192e1c38a729d58ebe73de..20bccabb54fcfb3ae22e67e526f595bf0b2119d8
--- 1/drivers/scsi/libata-core.c
--- 2/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -73,8 -73,6 +73,7 @@@ static int fgb(u32 bitmap)
  static int ata_choose_xfer_mode(const struct ata_port *ap,
                                u8 *xfer_mode_out,
                                unsigned int *xfer_shift_out);
- static void __ata_qc_complete(struct ata_queued_cmd *qc);
 +static void ata_pio_error(struct ata_port *ap);
  
  static unsigned int ata_unique_id = 1;
  static struct workqueue_struct *ata_wq;

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