Merge remote-tracking branch 'asoc/fix/intel' into asoc-linus

[sfrench/cifs-2.6.git] / Documentation / trace / events.txt

diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt
index 08d74d75150ddb40564c8da0187034412277b964..2cc08d4a326e120cab3c87b60f8cf67934604fd9 100644 (file)
--- a/Documentation/trace/events.txt
+++ b/Documentation/trace/events.txt
@@ -189,16 +189,13 @@ And for string fields they are:
 
 ==, !=, ~
 
-The glob (~) only accepts a wild card character (*) at the start and or
-end of the string. For example:
+The glob (~) accepts a wild card character (*,?) and character classes
+([). For example:
 
   prev_comm ~ "*sh"
   prev_comm ~ "sh*"
   prev_comm ~ "*sh*"
-
-But does not allow for it to be within the string:
-
-  prev_comm ~ "ba*sh"   <-- is invalid
+  prev_comm ~ "ba*sh"
 
 5.2 Setting filters
 -------------------