---

yaml --- r: 165981 b: refs/heads/master c: 38d8a95 h: refs/heads/master i: 165979: 0c87e71 v: v3
git-mirror · Sep 9, 2009 · 4822d20 · 4822d20
1 parent 99ae133
commit 4822d20
Show file tree

Hide file tree

Showing 8,590 changed files with 439,877 additions and 923,482 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7f21bb2e23b4fec16b448a34889f467465be659
+refs/heads/master: 38d8a95621b20ed7868e232a35a26ee61bdcae6f
diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -2800,7 +2800,7 @@ D: Starter of Linux1394 effort
 S: ask per mail for current address
 
 N: Nicolas Pitre
-E: nico@fluxnic.net
+E: nico@cam.org
 D: StrongARM SA1100 support integrator & hacker
 D: Xscale PXA architecture
 D: unified SMC 91C9x/91C11x ethernet driver (smc91x)

diff --git a/trunk/Documentation/00-INDEX b/trunk/Documentation/00-INDEX
@@ -82,8 +82,6 @@ block/
 	- info on the Block I/O (BIO) layer.
 blockdev/
 	- info on block devices & drivers
-btmrvl.txt
-	- info on Marvell Bluetooth driver usage.
 cachetlb.txt
 	- describes the cache/TLB flushing interfaces Linux uses.
 cdrom/

diff --git a/trunk/Documentation/ABI/stable/sysfs-class-backlight b/trunk/Documentation/ABI/stable/sysfs-class-backlight
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-pci b/trunk/Documentation/ABI/testing/sysfs-bus-pci
@@ -84,16 +84,6 @@ Description:
 		from this part of the device tree.
 		Depends on CONFIG_HOTPLUG.
 
-What:		/sys/bus/pci/devices/.../reset
-Date:		July 2009
-Contact:	Michael S. Tsirkin <mst@redhat.com>
-Description:
-		Some devices allow an individual function to be reset
-		without affecting other functions in the same device.
-		For devices that have this support, a file named reset
-		will be present in sysfs.  Writing 1 to this file
-		will perform reset.
-
 What:		/sys/bus/pci/devices/.../vpd
 Date:		February 2008
 Contact:	Ben Hutchings <bhutchings@solarflare.com>

diff --git a/trunk/Documentation/ABI/testing/sysfs-class-lcd b/trunk/Documentation/ABI/testing/sysfs-class-lcd
diff --git a/trunk/Documentation/ABI/testing/sysfs-class-led b/trunk/Documentation/ABI/testing/sysfs-class-led
diff --git a/trunk/Documentation/ABI/testing/sysfs-gpio b/trunk/Documentation/ABI/testing/sysfs-gpio
@@ -19,7 +19,6 @@ Description:
 	/gpioN ... for each exported GPIO #N
 	    /value ... always readable, writes fail for input GPIOs
 	    /direction ... r/w as: in, out (default low); write: high, low
-	    /edge ... r/w as: none, falling, rising, both
 	/gpiochipN ... for each gpiochip; #N is its first GPIO
 	    /base ... (r/o) same as N
 	    /label ... (r/o) descriptive, not necessarily unique

diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop b/trunk/Documentation/ABI/testing/sysfs-platform-asus-laptop
diff --git a/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-laptop b/trunk/Documentation/ABI/testing/sysfs-platform-eeepc-laptop
diff --git a/trunk/Documentation/DocBook/Makefile b/trunk/Documentation/DocBook/Makefile
@@ -14,7 +14,7 @@ DOCBOOKS := z8530book.xml mcabook.xml device-drivers.xml \
 	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
 	    mac80211.xml debugobjects.xml sh.xml regulator.xml \
 	    alsa-driver-api.xml writing-an-alsa-driver.xml \
-	    tracepoint.xml media.xml
+	    tracepoint.xml
 
 ###
 # The build process is as follows (targets):
@@ -32,7 +32,7 @@ PS_METHOD	= $(prefer-db2x)
 
 ###
 # The targets that may be used.
-PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs media
+PHONY += xmldocs sgmldocs psdocs pdfdocs htmldocs mandocs installmandocs cleandocs
 
 BOOKS := $(addprefix $(obj)/,$(DOCBOOKS))
 xmldocs: $(BOOKS)
@@ -45,16 +45,12 @@ PDF := $(patsubst %.xml, %.pdf, $(BOOKS))
 pdfdocs: $(PDF)
 
 HTML := $(sort $(patsubst %.xml, %.html, $(BOOKS)))
-htmldocs: media $(HTML)
+htmldocs: $(HTML)
 	$(call build_main_index)
 
 MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
 
-media:
-	mkdir -p $(srctree)/Documentation/DocBook/media/
-	cp $(srctree)/Documentation/DocBook/dvb/*.png $(srctree)/Documentation/DocBook/v4l/*.gif $(srctree)/Documentation/DocBook/media/
-
 installmandocs: mandocs
 	mkdir -p /usr/local/man/man9/
 	install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/

diff --git a/trunk/Documentation/DocBook/dvb/.gitignore b/trunk/Documentation/DocBook/dvb/.gitignore