---

yaml
---
r: 262063
b: refs/heads/master
c: d6b722a
h: refs/heads/master
i:
  262061: 78ecd1d
  262059: d9e57ae
  262055: d7915bd
  262047: 489ffd1
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12ff47e7f5fb64c566f62e6cf6a3b291c51bd337
+refs/heads/master: d6b722aa383a467a43d09ee38e866981abba08ab

trunk/CREDITS

@@ -504,7 +504,7 @@ N: Dominik Brodowski
 E: linux@brodo.de
 W: http://www.brodo.de/
 P: 1024D/725B37C6  190F 3E77 9C89 3B6D BECD  46EE 67C3 0308 725B 37C6
-D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
+D: parts of CPUFreq code, ACPI bugfixes
 S: Tuebingen, Germany
 
 N: Andries Brouwer
@@ -857,10 +857,6 @@ S: One Dell Way
 S: Round Rock, TX  78682
 S: USA
 
-N: Mattia Dongili
-E: malattia@gmail.com
-D: cpufrequtils (precursor to cpupowerutils)
-
 N: Ben Dooks
 E: ben-linux@fluff.org
 E: ben@simtec.co.uk
@@ -1887,11 +1883,6 @@ S: Kruislaan 419
 S: 1098 VA Amsterdam 
 S: The Netherlands
 
-N: Goran Koruga
-E: korugag@siol.net
-D: cpufrequtils (precursor to cpupowerutils)
-S: Slovenia
-
 N: Jiri Kosina
 E: jikos@jikos.cz
 E: jkosina@suse.cz
@@ -2925,12 +2916,6 @@ S: Schlossbergring 9
 S: 79098 Freiburg
 S: Germany
 
-N: Thomas Renninger
-E: trenn@suse.de
-D: cpupowerutils
-S: SUSE Linux GmbH
-S: Germany
-
 N: Joerg Reuter
 E: jreuter@yaina.de
 W: http://yaina.de/jreuter/

trunk/Documentation/ABI/testing/pstore

@@ -39,9 +39,3 @@ Description:	Generic interface to platform dependent persistent storage.
 		multiple) files based on the record size of the underlying
 		persistent storage until at least this amount is reached.
 		Default is 10 Kbytes.
-
-		Pstore only supports one backend at a time. If multiple
-		backends are available, the preferred backend may be
-		set by passing the pstore.backend= argument to the kernel at
-		boot time.
-

trunk/Documentation/DocBook/.gitignore

@@ -8,7 +8,4 @@
 *.dvi
 *.log
 *.out
-*.png
-*.gif
-media-indices.tmpl
-media-entities.tmpl
+media/

trunk/Documentation/DocBook/Makefile

@@ -14,9 +14,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
 	    80211.xml debugobjects.xml sh.xml regulator.xml \
 	    alsa-driver-api.xml writing-an-alsa-driver.xml \
-	    tracepoint.xml drm.xml media_api.xml
-
-include $(srctree)/Documentation/DocBook/media/Makefile
+	    tracepoint.xml media.xml drm.xml
 
 ###
 # The build process is as follows (targets):
@@ -34,7 +32,7 @@ PS_METHOD	= $(prefer-db2x)
 
 ###
 # The targets that may be used.
-PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
+PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs xmldoclinks
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 xmldocs: $(BOOKS)
@@ -47,14 +45,27 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
 pdfdocs: $(PDF)
 
 HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: $(HTML)
+htmldocs: $(HTML) xmldoclinks
 	$(call build_main_index)
 	$(call build_images)
-	$(call install_media_images)
 
 MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
 
+build_images = mkdir -p $(objtree)/Documentation/DocBook/media/ && \
+	       cp $(srctree)/Documentation/DocBook/dvb/*.png \
+	          $(srctree)/Documentation/DocBook/v4l/*.gif \
+		  $(objtree)/Documentation/DocBook/media/
+
+xmldoclinks:
+ifneq ($(objtree),$(srctree))
+	for dep in dvb media-entities.tmpl media-indices.tmpl v4l; do \
+		rm -f $(objtree)/Documentation/DocBook/$$dep \
+		&& ln -s $(srctree)/Documentation/DocBook/$$dep $(objtree)/Documentation/DocBook/ \
+		|| exit; \
+	done
+endif
+
 installmandocs: mandocs
 	mkdir -p /usr/local/man/man9/
 	install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
@@ -86,11 +97,11 @@ define rule_docproc
         ) > $(dir $@).$(notdir $@).cmd
 endef
 
-%.xml: %.tmpl FORCE
+%.xml: %.tmpl xmldoclinks FORCE
 	$(call if_changed_rule,docproc)
 
 ###
-#Read in all saved dependency files
+#Read in all saved dependency files 
 cmd_files := $(wildcard $(foreach f,$(BOOKS),$(dir $(f)).$(notdir $(f)).cmd))
 
 ifneq ($(cmd_files),)
@@ -139,7 +150,7 @@ quiet_cmd_db2pdf = PDF     $@
 
 index = index.html
 main_idx = Documentation/DocBook/$(index)
-build_main_index = rm -rf $(main_idx); \
+build_main_index = rm -rf $(main_idx) && \
 		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
 		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
 		   cat $(HTML) >> $(main_idx)
@@ -231,7 +242,7 @@ clean-files := $(DOCBOOKS) \
 
 clean-dirs := $(patsubst %.xml,%,$(DOCBOOKS)) man
 
-cleandocs: cleanmediadocs
+cleandocs:
 	$(Q)rm -f $(call objectify, $(clean-files))
 	$(Q)rm -rf $(call objectify, $(clean-dirs))