Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

d4bf2053 · Linus Torvalds · 8907e94b · e2b1be56 · d4bf2053 · d4bf2053
Commit d4bf2053 authored Nov 18, 2005 by Linus Torvalds
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 162 additions and 38 deletions

drivers/scsi/sata_mv.c drivers/scsi/sata_mv.c +2 -1

drivers/scsi/sata_sil24.c drivers/scsi/sata_sil24.c +160 -37

No files found.
--- a/drivers/scsi/sata_mv.c
+++ b/drivers/scsi/sata_mv.c
@@ -2,6 +2,7 @@
 * sata_mv.c - Marvell SATA support
 *
 * Copyright 2005: EMC Corporation, all rights reserved.
+ * Copyright 2005 Red Hat, Inc.  All rights reserved.
 *
 * Please ALWAYS copy linux-ide@vger.kernel.org on emails.
 *
@@ -36,7 +37,7 @@
 #include <asm/io.h>

 #define DRV_NAME	"sata_mv"
-#define DRV_VERSION	"0.25"
+#define DRV_VERSION	"0.5"

 enum {
 	/* BAR's are enumerated in terms of pci_resource_start() terms */

--- a/drivers/scsi/sata_sil24.c
+++ b/drivers/scsi/sata_sil24.c