diff --git a/[refs] b/[refs] index ee497f0ee748..3630e91a6b72 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 956097912c40a03bf22603a3be73503fd9ea9e44 +refs/heads/master: 03d646e62b06e9364e2dbb939d67934c6c9826cd diff --git a/trunk/Documentation/trace/events.txt b/trunk/Documentation/trace/events.txt index 02ac6ed38b2d..778ddf38b82c 100644 --- a/trunk/Documentation/trace/events.txt +++ b/trunk/Documentation/trace/events.txt @@ -90,7 +90,8 @@ In order to facilitate early boot debugging, use boot option: trace_event=[event-list] -The format of this boot option is the same as described in section 2.1. +event-list is a comma separated list of events. See section 2.1 for event +format. 3. Defining an event-enabled tracepoint =======================================