---

yaml
---
r: 116835
b: refs/heads/master
c: 6aea938
h: refs/heads/master
i:
  116833: 397710d
  116831: 5cf17ee
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dc8dcad83b53e3aebc52889e81772c00a1490408
+refs/heads/master: 6aea938f54ca785ce3bea67a8948698225c6ca58

trunk/.mailmap

@@ -66,7 +66,6 @@ Kenneth W Chen <kenneth.w.chen@intel.com>
 Koushik <raghavendra.koushik@neterion.com>
 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>
 Michael Buesch <mb@bu3sch.de>
 Michael Buesch <mbuesch@freenet.de>

trunk/CREDITS

@@ -1653,14 +1653,14 @@ S: Chapel Hill, North Carolina 27514-4818
 S: USA
 
 N: Dave Jones
-E: davej@redhat.com
+E: davej@codemonkey.org.uk
 W: http://www.codemonkey.org.uk
-D: Assorted VIA x86 support.
-D: 2.5 AGPGART overhaul.
+D: x86 errata/setup maintenance.
+D: AGPGART driver.
 D: CPUFREQ maintenance.
-D: Fedora kernel maintainence.
-D: Misc/Other.
-S: 314 Littleton Rd, Westford, MA 01886, USA
+D: Backport/Forwardport merge monkey.
+D: Various Janitor work.
+S: United Kingdom
 
 N: Martin Josfsson
 E: gandalf@wlug.westbo.se

trunk/Documentation/00-INDEX

@@ -21,9 +21,6 @@ Changes
 	- list of changes that break older software packages.
 CodingStyle
 	- how the boss likes the C code in the kernel to look.
-development-process/
-	- An extended tutorial on how to work with the kernel development
-	  process.
 DMA-API.txt
 	- DMA API, pci_ API & extensions for non-consistent memory machines.
 DMA-ISA-LPC.txt
@@ -162,6 +159,8 @@ hayes-esp.txt
 	- info on using the Hayes ESP serial driver.
 highuid.txt
 	- notes on the change from 16 bit to 32 bit user/group IDs.
+hpet.txt
+	- High Precision Event Timer Driver for Linux.
 timers/
 	- info on the timer related topics
 hw_random.txt

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

@@ -85,19 +85,3 @@ Description:
 Users:
 		PowerTOP <power@bughost.org>
 		http://www.lesswatts.org/projects/powertop/
-
-What:		/sys/bus/usb/device/<busnum>-<devnum>...:<config num>-<interface num>/supports_autosuspend
-Date:		January 2008
-KernelVersion:	2.6.27
-Contact:	Sarah Sharp <sarah.a.sharp@intel.com>
-Description:
-		When read, this file returns 1 if the interface driver
-		for this interface supports autosuspend.  It also
-		returns 1 if no driver has claimed this interface, as an
-		unclaimed interface will not stop the device from being
-		autosuspended if all other interface drivers are idle.
-		The file returns 0 if autosuspend support has not been
-		added to the driver.
-Users:
-		USB PM tool
-		git://git.moblin.org/users/sarah/usb-pm-tool/

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

@@ -1,7 +1,7 @@
 What:		/sys/class/regulator/.../state
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		state. This holds the regulator output state.
@@ -27,7 +27,7 @@ Description:
 What:		/sys/class/regulator/.../type
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		type. This holds the regulator type.
@@ -51,7 +51,7 @@ Description:
 What:		/sys/class/regulator/.../microvolts
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		microvolts. This holds the regulator output voltage setting
@@ -65,7 +65,7 @@ Description:
 What:		/sys/class/regulator/.../microamps
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		microamps. This holds the regulator output current limit
@@ -79,7 +79,7 @@ Description:
 What:		/sys/class/regulator/.../opmode
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		opmode. This holds the regulator operating mode setting.
@@ -102,7 +102,7 @@ Description:
 What:		/sys/class/regulator/.../min_microvolts
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		min_microvolts. This holds the minimum safe working regulator
@@ -116,7 +116,7 @@ Description:
 What:		/sys/class/regulator/.../max_microvolts
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		max_microvolts. This holds the maximum safe working regulator
@@ -130,7 +130,7 @@ Description:
 What:		/sys/class/regulator/.../min_microamps
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		min_microamps. This holds the minimum safe working regulator
@@ -145,7 +145,7 @@ Description:
 What:		/sys/class/regulator/.../max_microamps
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		max_microamps. This holds the maximum safe working regulator
@@ -157,23 +157,10 @@ Description:
 		platform code.
 
 
-What:		/sys/class/regulator/.../name
-Date:		October 2008
-KernelVersion:	2.6.28
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
-Description:
-		Each regulator directory will contain a field called
-		name. This holds a string identifying the regulator for
-		display purposes.
-
-		NOTE: this will be empty if no suitable name is provided
-		by platform or regulator drivers.
-
-
 What:		/sys/class/regulator/.../num_users
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		num_users. This holds the number of consumer devices that
@@ -183,7 +170,7 @@ Description:
 What:		/sys/class/regulator/.../requested_microamps
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		requested_microamps. This holds the total requested load
@@ -194,15 +181,15 @@ Description:
 What:		/sys/class/regulator/.../parent
 Date:		April 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Some regulator directories will contain a link called parent.
 		This points to the parent or supply regulator if one exists.
 
 What:		/sys/class/regulator/.../suspend_mem_microvolts
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_mem_microvolts. This holds the regulator output
@@ -216,7 +203,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_disk_microvolts
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_disk_microvolts. This holds the regulator output
@@ -230,7 +217,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_standby_microvolts
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_standby_microvolts. This holds the regulator output
@@ -244,7 +231,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_mem_mode
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_mem_mode. This holds the regulator operating mode
@@ -258,7 +245,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_disk_mode
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_disk_mode. This holds the regulator operating mode
@@ -271,7 +258,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_standby_mode
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_standby_mode. This holds the regulator operating mode
@@ -285,7 +272,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_mem_state
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_mem_state. This holds the regulator operating state
@@ -300,7 +287,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_disk_state
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_disk_state. This holds the regulator operating state
@@ -315,7 +302,7 @@ Description:
 What:		/sys/class/regulator/.../suspend_standby_state
 Date:		May 2008
 KernelVersion:	2.6.26
-Contact:	Liam Girdwood <lrg@slimlogic.co.uk>
+Contact:	Liam Girdwood <lg@opensource.wolfsonmicro.com>
 Description:
 		Each regulator directory will contain a field called
 		suspend_standby_state. This holds the regulator operating