Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71bfe47f authored Aug 04, 2006 by John W. Linville

Merge branch 'from-linus' into upstream

parents 73c1ac1e efe78cda

.gitignore

+5 −0

Original line number	Diff line number	Diff line
		@@ -30,6 +30,11 @@ include/config
		include/linux/autoconf.h
		include/linux/compile.h
		include/linux/version.h
		include/linux/utsrelease.h

		# stgit generated dirs
		patches-*

		# quilt's files
		patches
		series

Documentation/infiniband/ipoib.txt

+0 −2

Original line number	Diff line number	Diff line
		@@ -51,8 +51,6 @@ Debugging Information

		References

		IETF IP over InfiniBand (ipoib) Working Group
		http://ietf.org/html.charters/ipoib-charter.html
		Transmission of IP over InfiniBand (IPoIB) (RFC 4391)
		http://ietf.org/rfc/rfc4391.txt
		IP over InfiniBand (IPoIB) Architecture (RFC 4392)

Documentation/usb/proc_usb_info.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -59,7 +59,7 @@ bind to an interface (or perhaps several) using an ioctl call. You
		would issue more ioctls to the device to communicate to it using
		control, bulk, or other kinds of USB transfers. The IOCTLs are
		listed in the <linux/usbdevice_fs.h> file, and at this writing the
		source code (linux/drivers/usb/devio.c) is the primary reference
		source code (linux/drivers/usb/core/devio.c) is the primary reference
		for how to access devices through those files.

		Note that since by default these BBB/DDD files are writable only by

Documentation/usb/usb-help.txt

+1 −2

Original line number	Diff line number	Diff line
		@@ -5,8 +5,7 @@ For USB help other than the readme files that are located in
		Documentation/usb/*, see the following:

		Linux-USB project: http://www.linux-usb.org
		mirrors at http://www.suse.cz/development/linux-usb/
		and http://usb.in.tum.de/linux-usb/
		mirrors at http://usb.in.tum.de/linux-usb/
		and http://it.linux-usb.org
		Linux USB Guide: http://linux-usb.sourceforge.net
		Linux-USB device overview (working devices and drivers):

MAINTAINERS

+6 −0

Original line number	Diff line number	Diff line
		@@ -214,6 +214,12 @@ W: http://acpi.sourceforge.net/
		T: git kernel.org:/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6.git
		S: Maintained

		ACPI PCI HOTPLUG DRIVER
		P: Kristen Carlson Accardi
		M: kristen.c.accardi@intel.com
		L: pcihpd-discuss@lists.sourceforge.net
		S: Maintained

		AD1816 SOUND DRIVER
		P: Thorsten Knabe
		M: Thorsten Knabe <linux@thorsten-knabe.de>