diff --git a/[refs] b/[refs] index 4a9f5cea6d58..21885923af65 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8b260248d9e0e8b64bb72fd4dee03ad86984c344 +refs/heads/master: 9a68c1b9580886a2ff07a42733adb7583ee3d9ac diff --git a/trunk/drivers/scsi/Kconfig b/trunk/drivers/scsi/Kconfig index 84c42c44e04d..20dd85a77813 100644 --- a/trunk/drivers/scsi/Kconfig +++ b/trunk/drivers/scsi/Kconfig @@ -497,7 +497,7 @@ config SCSI_ATA_PIIX If unsure, say N. config SCSI_SATA_MV - tristate "Marvell SATA support" + tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" depends on SCSI_SATA && PCI && EXPERIMENTAL help This option enables support for the Marvell Serial ATA family.