diff --git a/[refs] b/[refs]
index 86b149500396..0b578cb91eac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0457882fed8af8580fb2f08183ea2dfbbc3ccac6
+refs/heads/master: 2bfc3611bd91986ed2b979a7f536c52751c8ac8f
diff --git a/trunk/drivers/ata/Kconfig b/trunk/drivers/ata/Kconfig
index 984ab284382a..b34e0a958d0f 100644
--- a/trunk/drivers/ata/Kconfig
+++ b/trunk/drivers/ata/Kconfig
@@ -40,9 +40,9 @@ config ATA_PIIX
 	tristate "Intel PIIX/ICH SATA support"
 	depends on PCI
 	help
-	  This option enables support for ICH5/6/7/8 Serial ATA.
-	  If PATA support was enabled previously, this enables
-	  support for select Intel PIIX/ICH PATA host controllers.
+	  This option enables support for ICH5/6/7/8 Serial ATA
+	  and support for PATA on the Intel PIIX3/PIIX4/ICH series
+	  PATA host controllers.
 
 	  If unsure, say N.