---

yaml
---
r: 245723
b: refs/heads/master
c: 45bb167
h: refs/heads/master
i:
  245721: 828d6ae
  245719: 2e5a9d5
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 13588209aa90d9c8e502750fc86160314555612f
+refs/heads/master: 45bb1674b976ef81429c1e42de05844b49d45dea

trunk/.gitignore

@@ -28,7 +28,6 @@ modules.builtin
 *.gz
 *.bz2
 *.lzma
-*.xz
 *.lzo
 *.patch
 *.gcno

trunk/.mailmap

@@ -20,7 +20,6 @@ Andreas Herrmann <aherrman@de.ibm.com>
 Andrew Morton <akpm@osdl.org>
 Andrew Vasquez <andrew.vasquez@qlogic.com>
 Andy Adamson <andros@citi.umich.edu>
-Archit Taneja <archit@ti.com>
 Arnaud Patard <arnaud.patard@rtp-net.org>
 Arnd Bergmann <arnd@arndb.de>
 Axel Dyks <xl@xlsigned.net>
@@ -71,7 +70,6 @@ Leonid I Ananiev <leonid.i.ananiev@intel.com>
 Linas Vepstas <linas@austin.ibm.com>
 Mark Brown <broonie@sirena.org.uk>
 Matthieu CASTET <castet.matthieu@free.fr>
-Mayuresh Janorkar <mayur@ti.com>
 Michael Buesch <mb@bu3sch.de>
 Michael Buesch <mbuesch@freenet.de>
 Michel Dänzer <michel@tungstengraphics.com>
@@ -80,7 +78,6 @@ Morten Welinder <terra@gnome.org>
 Morten Welinder <welinder@anemone.rentec.com>
 Morten Welinder <welinder@darter.rentec.com>
 Morten Welinder <welinder@troll.com>
-Mythri P K <mythripk@ti.com>
 Nguyen Anh Quynh <aquynh@gmail.com>
 Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
 Patrick Mochel <mochel@digitalimplant.org>
@@ -101,7 +98,6 @@ S.Çağlar Onur <caglar@pardus.org.tr>
 Simon Kelley <simon@thekelleys.org.uk>
 Stéphane Witzmann <stephane.witzmann@ubpmes.univ-bpclermont.fr>
 Stephen Hemminger <shemminger@osdl.org>
-Sumit Semwal <sumit.semwal@ti.com>
 Tejun Heo <htejun@gmail.com>
 Thomas Graf <tgraf@suug.ch>
 Tony Luck <tony.luck@intel.com>

trunk/CREDITS

@@ -1677,7 +1677,7 @@ W: http://www.codemonkey.org.uk
 D: Assorted VIA x86 support.
 D: 2.5 AGPGART overhaul.
 D: CPUFREQ maintenance.
-D: Fedora kernel maintenance.
+D: Fedora kernel maintainence.
 D: Misc/Other.
 S: 314 Littleton Rd, Westford, MA 01886, USA
 
@@ -3211,7 +3211,7 @@ N: James Simmons
 E: jsimmons@infradead.org
 E: jsimmons@users.sf.net 
 D: Frame buffer device maintainer
-D: input layer development
+D: input layer developement 
 D: tty/console layer
 D: various mipsel devices 
 S: 115 Carmel Avenue 
@@ -3290,7 +3290,7 @@ S: USA
 N: Manfred Spraul
 E: manfred@colorfullife.com
 W: http://www.colorfullife.com/~manfred
-D: Lots of tiny hacks. Larger improvements to SysV IPC msg,
+D: Lots of tiny hacks. Larger improvments to SysV IPC msg,
 D: slab, pipe, select.
 S: 71701 Schwieberdingen
 S: Germany

trunk/Documentation/00-INDEX

@@ -206,8 +206,8 @@ laptops/
 	- directory with laptop related info and laptop driver documentation.
 ldm.txt
 	- a brief description of LDM (Windows Dynamic Disks).
-leds/
-	- directory with info about LED handling under Linux.
+leds-class.txt
+	- documents LED handling under Linux.
 local_ops.txt
 	- semantics and behavior of local atomic operations.
 lockdep-design.txt
@@ -328,6 +328,10 @@ sysrq.txt
 	- info on the magic SysRq key.
 telephony/
 	- directory with info on telephony (e.g. voice over IP) support.
+time_interpolators.txt
+	- info on time interpolators.
+uml/
+	- directory with information about User Mode Linux.
 unicode.txt
 	- info on the Unicode character/font mapping used in Linux.
 unshare.txt
@@ -342,6 +346,8 @@ vm/
 	- directory with info on the Linux vm code.
 volatile-considered-harmful.txt
 	- Why the "volatile" type class should not be used
+voyager.txt
+	- guide to running Linux on the Voyager architecture.
 w1/
 	- directory with documents regarding the 1-wire (w1) subsystem.
 watchdog/

trunk/Documentation/ABI/stable/sysfs-class-backlight

@@ -34,23 +34,3 @@ Contact:	Richard Purdie <rpurdie@rpsys.net>
 Description:
 		Maximum brightness for <backlight>.
 Users:		HAL
-
-What:		/sys/class/backlight/<backlight>/type
-Date:		September 2010
-KernelVersion:	2.6.37
-Contact:	Matthew Garrett <mjg@redhat.com>
-Description:
-		The type of interface controlled by <backlight>.
-		"firmware": The driver uses a standard firmware interface
-		"platform": The driver uses a platform-specific interface
-		"raw": The driver controls hardware registers directly
-
-		In the general case, when multiple backlight
-		interfaces are available for a single device, firmware
-		control should be preferred to platform control should
-		be preferred to raw control. Using a firmware
-		interface reduces the probability of confusion with
-		the hardware and the OS independently updating the
-		backlight state. Platform interfaces are mostly a
-		holdover from pre-standardisation of firmware
-		interfaces.

trunk/Documentation/ABI/testing/sysfs-bus-css

@@ -29,7 +29,7 @@ Contact:	Cornelia Huck <cornelia.huck@de.ibm.com>
 		linux-s390@vger.kernel.org
 Description:	Contains the PIM/PAM/POM values, as reported by the
 		channel subsystem when last queried by the common I/O
-		layer (this implies that this attribute is not necessarily
+		layer (this implies that this attribute is not neccessarily
 		in sync with the values current in the channel subsystem).
 		Note: This is an I/O-subchannel specific attribute.
 Users:		s390-tools, HAL

trunk/Documentation/ABI/testing/sysfs-bus-pci

@@ -145,11 +145,9 @@ Date:		July 2010
 Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
 Description:
 		Reading this attribute will provide the firmware
-		given name (SMBIOS type 41 string or ACPI _DSM string) of
-		the PCI device.	The attribute will be created only
-		if the firmware	has given a name to the PCI device.
-		ACPI _DSM string name will be given priority if the
-		system firmware provides SMBIOS type 41 string also.
+		given name(SMBIOS type 41 string) of the PCI device.
+		The attribute will be created only if the firmware
+		has given a name to the PCI device.
 Users:
 		Userspace applications interested in knowing the
 		firmware assigned name of the PCI device.
@@ -159,27 +157,12 @@ Date:		July 2010
 Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
 Description:
 		Reading this attribute will provide the firmware
-		given instance (SMBIOS type 41 device type instance) of the
-		PCI device. The attribute will be created only if the firmware
-		has given an instance number to the PCI device.
+		given instance(SMBIOS type 41 device type instance)
+		of the PCI device. The attribute will be created
+		only if the firmware has given a device type instance
+		to the PCI device.
 Users:
 		Userspace applications interested in knowing the
 		firmware assigned device type instance of the PCI
 		device that can help in understanding the firmware
 		intended order of the PCI device.
-
-What:		/sys/bus/pci/devices/.../acpi_index
-Date:		July 2010
-Contact:	Narendra K <narendra_k@dell.com>, linux-bugs@dell.com
-Description:
-		Reading this attribute will provide the firmware
-		given instance (ACPI _DSM instance number) of the PCI device.
-		The attribute will be created only if the firmware has given
-		an instance number to the PCI device. ACPI _DSM instance number
-		will be given priority if the system firmware provides SMBIOS
-		type 41 device type instance also.
-Users:
-		Userspace applications interested in knowing the
-		firmware assigned instance number of the PCI
-		device that can help in understanding the firmware
-		intended order of the PCI device.

trunk/Documentation/ABI/testing/sysfs-bus-pci-devices-cciss

@@ -59,15 +59,3 @@ Kernel Version: 2.6.31
 Contact:	iss_storagedev@hp.com
 Description:	Displays the usage count (number of opens) of logical drive Y
 		of controller X.
-
-Where:		/sys/bus/pci/devices/<dev>/ccissX/resettable
-Date:		February 2011
-Kernel Version:	2.6.38
-Contact:	iss_storagedev@hp.com
-Description:	Value of 1 indicates the controller can honor the reset_devices
-		kernel parameter.  Value of 0 indicates reset_devices cannot be
-		honored.  This is to allow, for example, kexec tools to be able
-		to warn the user if they designate an unresettable device as
-		a dump device, as kdump requires resetting the device in order
-		to work reliably.
-

trunk/Documentation/ABI/testing/sysfs-bus-rbd

@@ -1,6 +1,6 @@
 What:		/sys/bus/rbd/
 Date:		November 2010
-Contact:	Yehuda Sadeh <yehuda@newdream.net>,
+Contact:	Yehuda Sadeh <yehuda@hq.newdream.net>,
 		Sage Weil <sage@newdream.net>
 Description:
 

trunk/Documentation/ABI/testing/sysfs-class-led

@@ -33,5 +33,5 @@ Contact:	Richard Purdie <rpurdie@rpsys.net>
 Description:
 		Invert the LED on/off state. This parameter is specific to
 		gpio and backlight triggers. In case of the backlight trigger,
-		it is useful when driving a LED which is intended to indicate
+		it is usefull when driving a LED which is intended to indicate
 		a device in a standby like state.