From: Andrew Morton <akpm@osdl.org>

Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/scsi/libsas/sas_scsi_host.c |    6 ------
 include/scsi/libsas.h               |    6 ------
 2 files changed, 12 deletions(-)

diff -puN drivers/scsi/libsas/sas_scsi_host.c~git-sas-fixup drivers/scsi/libsas/sas_scsi_host.c
--- a/drivers/scsi/libsas/sas_scsi_host.c~git-sas-fixup
+++ a/drivers/scsi/libsas/sas_scsi_host.c
@@ -833,7 +833,6 @@ void sas_shutdown_queue(struct sas_ha_st
 	spin_unlock_irqrestore(&core->task_queue_lock, flags);
 }
 
-<<<<<<< HEAD/drivers/scsi/libsas/sas_scsi_host.c
 static int do_sas_task_abort(struct sas_task *task)
 {
 	struct scsi_cmnd *sc = task->uldd_task;
@@ -892,7 +891,6 @@ void sas_task_abort(struct sas_task *tas
 	SAS_DPRINTK("%s: Could not kill task!\n", __FUNCTION__);
 }
 
-=======
 int sas_slave_alloc(struct scsi_device *scsi_dev)
 {
 	struct domain_device *dev = sdev_to_domain_dev(scsi_dev);
@@ -916,7 +914,6 @@ void sas_target_destroy(struct scsi_targ
 	return;
 }
 
->>>>>>> /drivers/scsi/libsas/sas_scsi_host.c
 EXPORT_SYMBOL_GPL(sas_queuecommand);
 EXPORT_SYMBOL_GPL(sas_target_alloc);
 EXPORT_SYMBOL_GPL(sas_slave_configure);
@@ -924,11 +921,8 @@ EXPORT_SYMBOL_GPL(sas_slave_destroy);
 EXPORT_SYMBOL_GPL(sas_change_queue_depth);
 EXPORT_SYMBOL_GPL(sas_change_queue_type);
 EXPORT_SYMBOL_GPL(sas_bios_param);
-<<<<<<< HEAD/drivers/scsi/libsas/sas_scsi_host.c
 EXPORT_SYMBOL_GPL(sas_task_abort);
 EXPORT_SYMBOL_GPL(sas_phy_reset);
-=======
 EXPORT_SYMBOL_GPL(sas_slave_alloc);
 EXPORT_SYMBOL_GPL(sas_target_destroy);
 EXPORT_SYMBOL_GPL(sas_ioctl);
->>>>>>> /drivers/scsi/libsas/sas_scsi_host.c
diff -puN include/scsi/libsas.h~git-sas-fixup include/scsi/libsas.h
--- a/include/scsi/libsas.h~git-sas-fixup
+++ a/include/scsi/libsas.h
@@ -605,11 +605,8 @@ struct sas_domain_function_template {
 extern int sas_register_ha(struct sas_ha_struct *);
 extern int sas_unregister_ha(struct sas_ha_struct *);
 
-<<<<<<< HEAD/include/scsi/libsas.h
 int sas_phy_reset(struct sas_phy *phy, int hard_reset);
-=======
 int sas_queue_up(struct sas_task *task);
->>>>>>> /include/scsi/libsas.h
 extern int sas_queuecommand(struct scsi_cmnd *,
 		     void (*scsi_done)(struct scsi_cmnd *));
 extern int sas_target_alloc(struct scsi_target *);
@@ -642,13 +639,10 @@ void sas_unregister_dev(struct domain_de
 
 void sas_init_dev(struct domain_device *);
 
-<<<<<<< HEAD/include/scsi/libsas.h
 void sas_task_abort(struct sas_task *task);
 
-=======
 extern void sas_target_destroy(struct scsi_target *);
 extern int sas_slave_alloc(struct scsi_device *);
 extern int sas_ioctl(struct scsi_device *sdev, int cmd, void __user *arg);
 
->>>>>>> /include/scsi/libsas.h
 #endif /* _SASLIB_H_ */
_