---

yaml
---
r: 262223
b: refs/heads/master
c: d8926bb
h: refs/heads/master
i:
  262221: f4721f9
  262219: 8371d77
  262215: 2203d25
  262207: 796a868
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a6b11f53388973d99c4a357c22b19753b424e73c
+refs/heads/master: d8926bb3badd36670fecf2de4a062c78bc37430b

trunk/.gitignore

@@ -45,11 +45,6 @@ modules.builtin
 /Module.markers
 /Module.symvers
 
-#
-# Debian directory (make deb-pkg)
-#
-/debian/
-
 #
 # git files that we don't want to ignore even it they are dot-files
 #

trunk/.mailmap

@@ -73,7 +73,8 @@ 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 <m@bues.ch>
+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>

trunk/CREDITS

@@ -504,7 +504,7 @@ N: Dominik Brodowski
 E: linux@brodo.de
 W: http://www.brodo.de/
 P: 1024D/725B37C6  190F 3E77 9C89 3B6D BECD  46EE 67C3 0308 725B 37C6
-D: parts of CPUFreq code, ACPI bugfixes, PCMCIA rewrite, cpufrequtils
+D: parts of CPUFreq code, ACPI bugfixes
 S: Tuebingen, Germany
 
 N: Andries Brouwer
@@ -857,10 +857,6 @@ S: One Dell Way
 S: Round Rock, TX  78682
 S: USA
 
-N: Mattia Dongili
-E: malattia@gmail.com
-D: cpufrequtils (precursor to cpupowerutils)
-
 N: Ben Dooks
 E: ben-linux@fluff.org
 E: ben@simtec.co.uk
@@ -1887,11 +1883,6 @@ S: Kruislaan 419
 S: 1098 VA Amsterdam 
 S: The Netherlands
 
-N: Goran Koruga
-E: korugag@siol.net
-D: cpufrequtils (precursor to cpupowerutils)
-S: Slovenia
-
 N: Jiri Kosina
 E: jikos@jikos.cz
 E: jkosina@suse.cz
@@ -2925,12 +2916,6 @@ S: Schlossbergring 9
 S: 79098 Freiburg
 S: Germany
 
-N: Thomas Renninger
-E: trenn@suse.de
-D: cpupowerutils
-S: SUSE Linux GmbH
-S: Germany
-
 N: Joerg Reuter
 E: jreuter@yaina.de
 W: http://yaina.de/jreuter/

trunk/Documentation/ABI/obsolete/proc-pid-oom_adj

@@ -14,7 +14,7 @@ Why:	/proc/<pid>/oom_adj allows userspace to influence the oom killer's
 
 	A much more powerful interface, /proc/<pid>/oom_score_adj, was
 	introduced with the oom killer rewrite that allows users to increase or
-	decrease the badness score linearly.  This interface will replace
+	decrease the badness() score linearly.  This interface will replace
 	/proc/<pid>/oom_adj.
 
 	A warning will be emitted to the kernel log if an application uses this

trunk/Documentation/ABI/testing/pstore

@@ -39,9 +39,3 @@ Description:	Generic interface to platform dependent persistent storage.
 		multiple) files based on the record size of the underlying
 		persistent storage until at least this amount is reached.
 		Default is 10 Kbytes.
-
-		Pstore only supports one backend at a time. If multiple
-		backends are available, the preferred backend may be
-		set by passing the pstore.backend= argument to the kernel at
-		boot time.
-

trunk/Documentation/ABI/testing/sysfs-driver-hid-roccat-koneplus

@@ -92,14 +92,6 @@ Description:	The mouse has a tracking- and a distance-control-unit. These
 		This file is writeonly.
 Users:		http://roccat.sourceforge.net
 
-What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/talk
-Date:		May 2011
-Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>
-Description:	Used to active some easy* functions of the mouse from outside.
-		The data has to be 16 bytes long.
-		This file is writeonly.
-Users:		http://roccat.sourceforge.net
-
 What:		/sys/bus/usb/devices/<busnum>-<devnum>:<config num>.<interface num>/<hid-bus>:<vendor-id>:<product-id>.<num>/koneplus/roccatkoneplus<minor>/tcu
 Date:		October 2010
 Contact:	Stefan Achatz <erazor_de@users.sourceforge.net>