diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-04-22 20:08:44 -0400 |
| commit | 6c9468e9eb1252eaefd94ce7f06e1be9b0b641b1 (patch) | |
| tree | 797676a336b050bfa1ef879377c07e541b9075d6 /Documentation/DocBook | |
| parent | 4cb3ca7cd7e2cae8d1daf5345ec99a1e8502cf3f (diff) | |
| parent | c81eddb0e3728661d1585fbc564449c94165cc36 (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'Documentation/DocBook')
| -rw-r--r-- | Documentation/DocBook/tracepoint.tmpl | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/DocBook/tracepoint.tmpl b/Documentation/DocBook/tracepoint.tmpl index 8bca1d5cec09..e8473eae2a20 100644 --- a/Documentation/DocBook/tracepoint.tmpl +++ b/Documentation/DocBook/tracepoint.tmpl | |||
| @@ -16,6 +16,15 @@ | |||
| 16 | </address> | 16 | </address> |
| 17 | </affiliation> | 17 | </affiliation> |
| 18 | </author> | 18 | </author> |
| 19 | <author> | ||
| 20 | <firstname>William</firstname> | ||
| 21 | <surname>Cohen</surname> | ||
| 22 | <affiliation> | ||
| 23 | <address> | ||
| 24 | <email>wcohen@redhat.com</email> | ||
| 25 | </address> | ||
| 26 | </affiliation> | ||
| 27 | </author> | ||
| 19 | </authorgroup> | 28 | </authorgroup> |
| 20 | 29 | ||
| 21 | <legalnotice> | 30 | <legalnotice> |
| @@ -91,4 +100,8 @@ | |||
| 91 | !Iinclude/trace/events/signal.h | 100 | !Iinclude/trace/events/signal.h |
| 92 | </chapter> | 101 | </chapter> |
| 93 | 102 | ||
| 103 | <chapter id="block"> | ||
| 104 | <title>Block IO</title> | ||
| 105 | !Iinclude/trace/events/block.h | ||
| 106 | </chapter> | ||
| 94 | </book> | 107 | </book> |