Merge by hand (whitespace conflicts in libata.h)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

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

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

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

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

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

diff --cc drivers/scsi/ips.h
Simple merge

diff --cc drivers/scsi/megaraid/mega_common.h
Simple merge

diff --cc drivers/scsi/megaraid/megaraid_sas.c
Simple merge

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

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

diff --cc drivers/scsi/pci2000.h
Simple merge

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

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

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