Merge bk://gkernel.bkbits.net/libata-2.6

into ppc970.osdl.org:/home/torvalds/v2.5/linux

drivers/scsi/libata.h

@@ -26,7 +26,7 @@
 #define __LIBATA_H__
 
 #define DRV_NAME	"libata"
-#define DRV_VERSION	"1.01"	/* must be exactly four chars */
+#define DRV_VERSION	"1.02"	/* must be exactly four chars */
 
 struct ata_scsi_args {
 	struct ata_port		*ap;

drivers/scsi/sata_sil.c

@@ -35,7 +35,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME	"sata_sil"
-#define DRV_VERSION	"0.53"
+#define DRV_VERSION	"0.54"
 
 enum {
 	sil_3112		= 0,