---

yaml --- r: 260794 b: refs/heads/master c: 8f398ae h: refs/heads/master v: v3
git-mirror · Jul 23, 2011 · 7b59cf2 · 7b59cf2
1 parent 9115f03
commit 7b59cf2
Show file tree

Hide file tree

Showing 7,253 changed files with 435,554 additions and 466,775 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70a3eff5768350c0313a9ae70a15da113171d0ab
+refs/heads/master: 8f398ae72fc7e03356fc1ee6b54beef79ba6be6a
diff --git a/trunk/.gitignore b/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
 #

diff --git a/trunk/.mailmap b/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>

diff --git a/trunk/CREDITS b/trunk/CREDITS
@@ -518,14 +518,6 @@ N: Zach Brown
 E: zab@zabbo.net
 D: maestro pci sound
 
-N: David Brownell
-D: Kernel engineer, mentor, and friend.  Maintained USB EHCI and
-D: gadget layers, SPI subsystem, GPIO subsystem, and more than a few
-D: device drivers.  His encouragement also helped many engineers get
-D: started working on the Linux kernel.  David passed away in early
-D: 2011, and will be greatly missed.
-W: https://lkml.org/lkml/2011/4/5/36
-
 N: Gary Brubaker
 E: xavyer@ix.netcom.com
 D: USB Serial Empeg Empeg-car Mark I/II Driver

diff --git a/trunk/Documentation/ABI/obsolete/proc-pid-oom_adj b/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

diff --git a/trunk/Documentation/ABI/stable/firewire-cdev b/trunk/Documentation/ABI/stable/firewire-cdev
diff --git a/trunk/Documentation/ABI/stable/sysfs-bus-firewire b/trunk/Documentation/ABI/stable/sysfs-bus-firewire
diff --git a/trunk/Documentation/ABI/stable/vdso b/trunk/Documentation/ABI/stable/vdso
diff --git a/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480 b/trunk/Documentation/ABI/testing/sysfs-bus-i2c-devices-fsa9480
diff --git a/trunk/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870 b/trunk/Documentation/ABI/testing/sysfs-class-backlight-driver-adp8870