---

yaml
---
r: 242236
b: refs/heads/master
c: 414b4ff
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3dab04e6978e358ad2307bca563fabd6c5d2c58b
+refs/heads/master: 414b4ff5eecff0097d09c4a7da12e435fd503692

trunk/.gitignore

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

trunk/.mailmap

@@ -20,11 +20,9 @@ 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>
-Axel Lin <axel.lin@gmail.com>
 Ben Gardner <bgardner@wabtec.com>
 Ben M Cahill <ben.m.cahill@intel.com>
 Björn Steinbrink <B.Steinbrink@gmx.de>
@@ -71,7 +69,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 +77,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 +97,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>
@@ -110,4 +105,3 @@ Uwe Kleine-König <ukleinek@informatik.uni-freiburg.de>
 Uwe Kleine-König <ukl@pengutronix.de>
 Uwe Kleine-König <Uwe.Kleine-Koenig@digi.com>
 Valdis Kletnieks <Valdis.Kletnieks@vt.edu>
-Takashi YOSHII <takashi.yoshii.zj@renesas.com>

trunk/CREDITS

@@ -2365,6 +2365,8 @@ 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: R. Brasílio Itiberê, 4270/1010 - Água Verde
+S: 80240-060 - Curitiba - Paraná
 S: Brazil
 
 N: Karsten Merker
@@ -2811,8 +2813,8 @@ D: CDROM driver "sonycd535" (Sony CDU-535/531)
 N: Stelian Pop
 E: stelian@popies.net
 P: 1024D/EDBB6147 7B36 0E07 04BC 11DC A7A0  D3F7 7185 9E7A EDBB 6147
-D: random kernel hacks
-S: Paimpont, France
+D: sonypi, meye drivers, mct_u232 usb serial hacks
+S: Paris, France
 
 N: Pete Popov
 E: pete_popov@yahoo.com

trunk/Documentation/00-INDEX

@@ -328,6 +328,8 @@ 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
@@ -344,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-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-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

@@ -26,12 +26,3 @@ Description:
 		scheduler is chosen. Trigger specific parameters can appear in
 		/sys/class/leds/<led> once a given trigger is selected.
 
-What:		/sys/class/leds/<led>/inverted
-Date:		January 2011
-KernelVersion:	2.6.38
-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 usefull when driving a LED which is intended to indicate
-		a device in a standby like state.