diff --git a/[refs] b/[refs]
index 4906a3f033e9..cd845d9ad34a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acf42a2a575777681fee45ed59d7140be38e9142
+refs/heads/master: a27fc96b0317b732b68b5f781bbdeb56ab5082a8
diff --git a/trunk/include/linux/ethtool.h b/trunk/include/linux/ethtool.h
index 42378b34ae8f..3829712ccc05 100644
--- a/trunk/include/linux/ethtool.h
+++ b/trunk/include/linux/ethtool.h
@@ -173,6 +173,12 @@ struct ethtool_eeprom {
  * would cause interrupts to never be generated.  To disable
  * coalescing, set usecs = 0 and max_frames = 1.
  *
+ * Some implementations ignore the value of max_frames and use the
+ * condition:
+ *	time_since_first_completion >= usecs
+ * This is deprecated.  Drivers for hardware that does not support
+ * counting completions should validate that max_frames == !rx_usecs.
+ *
  * Adaptive RX/TX coalescing is an algorithm implemented by some
  * drivers to improve latency under low packet rates and improve
  * throughput under high packet rates.  Some drivers only implement