Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 (bc95f366) · Commits · e / devices / android_kernel_sony_msm8994

.mailmap

+2 −0

Original line number	Diff line number	Diff line
		@@ -67,6 +67,8 @@ Koushik <raghavendra.koushik@neterion.com>
		Leonid I Ananiev <leonid.i.ananiev@intel.com>
		Linas Vepstas <linas@austin.ibm.com>
		Matthieu CASTET <castet.matthieu@free.fr>
		Michael Buesch <mb@bu3sch.de>
		Michael Buesch <mbuesch@freenet.de>
		Michel Dänzer <michel@tungstengraphics.com>
		Mitesh shah <mshah@teja.com>
		Morten Welinder <terra@gnome.org>

CREDITS

+19 −5

Original line number	Diff line number	Diff line
		@@ -317,6 +317,12 @@ S: 2322 37th Ave SW
		S: Seattle, Washington 98126-2010
		S: USA

		N: Johannes Berg
		E: johannes@sipsolutions.net
		W: http://johannes.sipsolutions.net/
		P: 1024D/9AB78CA5 AD02 0176 4E29 C137 1DF6 08D2 FC44 CF86 9AB7 8CA5
		D: powerpc & 802.11 hacker

		N: Stephen R. van den Berg (AKA BuGless)
		E: berg@pool.informatik.rwth-aachen.de
		D: General kernel, gcc, and libc hacker
		@@ -2286,14 +2292,14 @@ S: D-90453 Nuernberg
		S: Germany

		N: Arnaldo Carvalho de Melo
		E: acme@mandriva.com
		E: acme@ghostprotocols.net
		E: arnaldo.melo@gmail.com
		E: acme@redhat.com
		W: http://oops.ghostprotocols.net:81/blog/
		P: 1024D/9224DF01 D5DF E3BB E3C8 BCBB F8AD 841A B6AB 4681 9224 DF01
		D: IPX, LLC, DCCP, cyc2x, wl3501_cs, net/ hacks
		S: Mandriva
		S: R. Tocantins, 89 - Cristo Rei
		S: 80050-430 - Curitiba - Paran
		S: R. Braslio Itiber, 4270/1010 - gua Verde
		S: 80240-060 - Curitiba - Paran
		S: Brazil

		N: Karsten Merker
		@@ -2678,7 +2684,7 @@ S: Ottawa, Ontario
		S: Canada K2P 0X8

		N: Mikael Pettersson
		E: mikpe@csd.uu.se
		E: mikpe@it.uu.se
		W: http://www.csd.uu.se/~mikpe/
		D: Miscellaneous fixes

		@@ -3295,6 +3301,14 @@ S: 12725 SW Millikan Way, Suite 400
		S: Beaverton, Oregon 97005
		S: USA

		N: Li Yang
		E: leoli@freescale.com
		D: Freescale Highspeed USB device driver
		D: Freescale QE SoC support and Ethernet driver
		S: B-1206 Jingmao Guojigongyu
		S: 16 Baliqiao Nanjie, Beijing 101100
		S: People's Repulic of China

		N: Marcelo Tosatti
		E: marcelo@kvack.org
		D: v2.4 kernel maintainer

Documentation/ABI/obsolete/dv1394

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		What: dv1394 (a.k.a. "OHCI-DV I/O support" for FireWire)
		Contact: linux1394-devel@lists.sourceforge.net
		Description:
		New application development should use raw1394 + userspace libraries
		instead, notably libiec61883 which is functionally equivalent.

		Users:
		ffmpeg/libavformat (used by a variety of media players)
		dvgrab v1.x (replaced by dvgrab2 on top of raw1394 and resp. libraries)

Documentation/ABI/testing/sysfs-bus-usb

0 → 100644

+41 −0

Original line number	Diff line number	Diff line
		What: /sys/bus/usb/devices/.../power/autosuspend
		Date: March 2007
		KernelVersion: 2.6.21
		Contact: Alan Stern <stern@rowland.harvard.edu>
		Description:
		Each USB device directory will contain a file named
		power/autosuspend. This file holds the time (in seconds)
		the device must be idle before it will be autosuspended.
		0 means the device will be autosuspended as soon as
		possible. Negative values will prevent the device from
		being autosuspended at all, and writing a negative value
		will resume the device if it is already suspended.

		The autosuspend delay for newly-created devices is set to
		the value of the usbcore.autosuspend module parameter.

		What: /sys/bus/usb/devices/.../power/level
		Date: March 2007
		KernelVersion: 2.6.21
		Contact: Alan Stern <stern@rowland.harvard.edu>
		Description:
		Each USB device directory will contain a file named
		power/level. This file holds a power-level setting for
		the device, one of "on", "auto", or "suspend".

		"on" means that the device is not allowed to autosuspend,
		although normal suspends for system sleep will still
		be honored. "auto" means the device will autosuspend
		and autoresume in the usual manner, according to the
		capabilities of its driver. "suspend" means the device
		is forced into a suspended state and it will not autoresume
		in response to I/O requests. However remote-wakeup requests
		from the device may still be enabled (the remote-wakeup
		setting is controlled separately by the power/wakeup
		attribute).

		During normal use, devices should be left in the "auto"
		level. The other levels are meant for administrative uses.
		If you want to suspend a device immediately but leave it
		free to wake up in response to I/O requests, you should
		write "0" to power/autosuspend.

Documentation/DocBook/kernel-api.tmpl

+6 −0

Original line number	Diff line number	Diff line
		@@ -236,6 +236,12 @@ 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
		-->