merge linus into release branch

[linux-2.6] / drivers / scsi / sata_uli.c

diff --git a/drivers/scsi/sata_uli.c b/drivers/scsi/sata_uli.c
index f668c997e9af0bccf3637fe60375c6ebbd7ee661..64f3c1aeed217d5f07250a69c8f8e8afacff8d77 100644 (file)
--- a/drivers/scsi/sata_uli.c
+++ b/drivers/scsi/sata_uli.c
@@ -37,7 +37,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sata_uli"
-#define DRV_VERSION    "0.6"
+#define DRV_VERSION    "1.0"
 
 enum {
        uli_5289                = 0,