diff options
| author | Michal Marek <mmarek@suse.cz> | 2010-08-04 08:05:07 -0400 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2010-08-04 08:05:07 -0400 |
| commit | 7a996d3ab150bb0e1b71fa182f70199a703efdd1 (patch) | |
| tree | 96a36947d90c9b96580899abd38cb3b70cd9d40b /Documentation/DocBook/tracepoint.tmpl | |
| parent | 7cf3d73b4360e91b14326632ab1aeda4cb26308d (diff) | |
| parent | 9fe6206f400646a2322096b56c59891d530e8d51 (diff) | |
Merge commit 'v2.6.35' into kbuild/kconfig
Conflicts:
scripts/kconfig/Makefile
Diffstat (limited to 'Documentation/DocBook/tracepoint.tmpl')
| -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> |