Merge branches 'tracing/ftrace', 'tracing/hw-branch-tracing' and 'lin…

…us' into tracing/core
git-mirror · Feb 26, 2009 · e36b1e1 · e36b1e1
3 parents d7350c3 + 2d542cf + 694593e
commit e36b1e1
Show file tree

Hide file tree

Showing 191 changed files with 11,708 additions and 1,190 deletions.
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
@@ -6,7 +6,7 @@
 # To add a new book the only step required is to add the book to the
 # list of DOCBOOKS.
 
-DOCBOOKS := z8530book.xml mcabook.xml \
+DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
 	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
 	    procfs-guide.xml writing_usb_driver.xml networking.xml \
 	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \