---

yaml --- r: 54380 b: refs/heads/master c: 35ff032 h: refs/heads/master v: v3
git-mirror · May 1, 2007 · 0402673 · 0402673
1 parent 6492937
commit 0402673
Show file tree

Hide file tree

Showing 2,845 changed files with 71,021 additions and 197,194 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b6b54982258c330247957a8d877b9851ac69d53
+refs/heads/master: 35ff032e65ab5cc03bbba46cefece7376c7c562f
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -1745,9 +1745,8 @@ S: D-64295
 S: Germany
 
 N: Andi Kleen
-E: andi@firstfloor.org
-U: http://www.halobates.de
-D: network, x86, NUMA, various hacks
+E: ak@muc.de
+D: network hacker, syncookies
 S: Schwalbenstr. 96
 S: 85551 Ottobrunn
 S: Germany

diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile
@@ -41,7 +41,7 @@ psdocs: $(PS)
 PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
 pdfdocs: $(PDF)
 
-HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
+HTML := $(patsubst %.xml, %.html, $(BOOKS))
 htmldocs: $(HTML)
 
 MAN := $(patsubst %.xml, %.9, $(BOOKS))
@@ -152,7 +152,6 @@ quiet_cmd_db2man = MAN     $@
 	@(which xmlto > /dev/null 2>&1) || \
 	 (echo "*** You need to install xmlto ***"; \
 	  exit 1)
-	$(Q)mkdir -p $(obj)/man
 	$(call cmd,db2man)
 	@touch $@
 
@@ -213,7 +212,11 @@ clean-files := $(DOCBOOKS) \
 	$(patsubst %.xml, %.9,    $(DOCBOOKS)) \
 	$(C-procfs-example)
 
-clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
+clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS))
+
+#man put files in man subdir - traverse down
+subdir- := man/
+
 
 # Declare the contents of the .PHONY variable as phony.  We keep that
 # information in a variable se we can use it in if_changed and friends.

diff --git a/trunk/Documentation/DocBook/kernel-api.tmpl b/trunk/Documentation/DocBook/kernel-api.tmpl
@@ -236,12 +236,6 @@ X!Ilib/string.c
 !Enet/core/dev.c
 !Enet/ethernet/eth.c
 !Iinclude/linux/etherdevice.h
-!Edrivers/net/phy/phy.c
-!Idrivers/net/phy/phy.c
-!Edrivers/net/phy/phy_device.c
-!Idrivers/net/phy/phy_device.c
-!Edrivers/net/phy/mdio_bus.c
-!Idrivers/net/phy/mdio_bus.c
 <!-- FIXME: Removed for now since no structured comments in source
 X!Enet/core/wireless.c
 -->

diff --git a/trunk/Documentation/DocBook/man/Makefile b/trunk/Documentation/DocBook/man/Makefile
@@ -0,0 +1,3 @@
+# Rules are put in Documentation/DocBook
+
+clean-files := *.9.gz *.sgml manpage.links manpage.refs
diff --git a/trunk/Documentation/blackfin/00-INDEX b/trunk/Documentation/blackfin/00-INDEX
diff --git a/trunk/Documentation/blackfin/Filesystems b/trunk/Documentation/blackfin/Filesystems
diff --git a/trunk/Documentation/blackfin/cache-lock.txt b/trunk/Documentation/blackfin/cache-lock.txt
diff --git a/trunk/Documentation/blackfin/cachefeatures.txt b/trunk/Documentation/blackfin/cachefeatures.txt
diff --git a/trunk/Documentation/dontdiff b/trunk/Documentation/dontdiff
@@ -55,8 +55,8 @@ aic7*seq.h*
 aicasm
 aicdb.h*
 asm
-asm-offsets.h
-asm_offsets.h
+asm-offsets.*
+asm_offsets.*
 autoconf.h*
 bbootsect
 bin2c

diff --git a/trunk/Documentation/driver-model/devres.txt b/trunk/Documentation/driver-model/devres.txt
@@ -182,7 +182,7 @@ For example, you can do something like the following.
 
 	...
 
-	devres_close_group(dev, my_midlayer_create_something);
+	devres_close_group(dev, my_midlayer_something);
 	return 0;
   }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		# Rules are put in Documentation/DocBook

		clean-files := .9.gz .sgml manpage.links manpage.refs
-Original file line number
+Diff line change
@@ Expand Up / @@ -182,7 +182,7 @@ For example, you can do something like the following. @@
     	...
-    	devres_close_group(dev, my_midlayer_create_something);
+    	devres_close_group(dev, my_midlayer_something);
     	return 0;
       }
@@ Expand Down @@