aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/tracepoint.tmpl
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-04-16 15:20:06 +0200
committerTakashi Iwai <tiwai@suse.de>2010-04-16 15:20:06 +0200
commitcf0dbba515415bb19b11f9323d5f7bebd7f24fd6 (patch)
tree375bbc1ade1a92acd6493d224dd701fd7f209014 /Documentation/DocBook/tracepoint.tmpl
parent1cff399ecd9125d8e6a634a1957be1aeb3195a12 (diff)
parent0340c7dccd80d8706c636e030a6ebbddbddca690 (diff)
downloadkernel_goldelico_gta04-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.zip
kernel_goldelico_gta04-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.gz
kernel_goldelico_gta04-cf0dbba515415bb19b11f9323d5f7bebd7f24fd6.tar.bz2
Merge remote branch 'alsa/devel' into topic/misc
Diffstat (limited to 'Documentation/DocBook/tracepoint.tmpl')
-rw-r--r--Documentation/DocBook/tracepoint.tmpl13
1 files changed, 13 insertions, 0 deletions
diff --git a/Documentation/DocBook/tracepoint.tmpl b/Documentation/DocBook/tracepoint.tmpl
index 8bca1d5..e8473ea 100644
--- a/Documentation/DocBook/tracepoint.tmpl
+++ b/Documentation/DocBook/tracepoint.tmpl
@@ -16,6 +16,15 @@
</address>
</affiliation>
</author>
+ <author>
+ <firstname>William</firstname>
+ <surname>Cohen</surname>
+ <affiliation>
+ <address>
+ <email>wcohen@redhat.com</email>
+ </address>
+ </affiliation>
+ </author>
</authorgroup>
<legalnotice>
@@ -91,4 +100,8 @@
!Iinclude/trace/events/signal.h
</chapter>
+ <chapter id="block">
+ <title>Block IO</title>
+!Iinclude/trace/events/block.h
+ </chapter>
</book>