Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ into merge_linus

Conflicts:

	include/linux/sunrpc/xprt.h
	net/sunrpc/xprtsock.c
Fix up conflicts with the workqueue changes.

1 files changed, 7 insertions, 3 deletions

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index db9499adbed4..36526a1e76d7 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -190,9 +190,13 @@ quiet_cmd_fig2png = FIG2PNG $@
 ###
 # Help targets as used by the top-level makefile
 dochelp:
-        @echo  '  Linux kernel internal documentation in different formats:'
-        @echo  '  xmldocs (XML DocBook), psdocs (Postscript), pdfdocs (PDF)'
-        @echo  '  htmldocs (HTML), mandocs (man pages, use installmandocs to install)'
+        @echo  ' Linux kernel internal documentation in different formats:'
+        @echo  '  htmldocs        - HTML'
+        @echo  '  installmandocs  - install man pages generated by mandocs'
+        @echo  '  mandocs         - man pages'
+        @echo  '  pdfdocs         - PDF'
+        @echo  '  psdocs          - Postscript'
+        @echo  '  xmldocs         - XML DocBook'
 
 ###
 # Temporary files left by various tools