Merge branch 'tracing/ftrace'; commit 'v2.6.29-rc6' into tracing/core

git-mirror · Feb 24, 2009 · a7f4463 · a7f4463
2 parents c478f87 + 20f4d6c
commit a7f4463
Show file tree

Hide file tree

Showing 126 changed files with 3,469 additions and 1,059 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 \