Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30716e07 authored by James Bottomley's avatar James Bottomley
Browse files

Merge branch 'linus'

parents 03c79cc5 f56df2f4
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -3279,7 +3279,7 @@ S: Sevilla 41005
S: Spain

N: Linus Torvalds
E: torvalds@osdl.org
E: torvalds@linux-foundation.org
D: Original kernel hacker
S: 12725 SW Millikan Way, Suite 400
S: Beaverton, Oregon 97005
+1 −1
Original line number Diff line number Diff line
@@ -883,7 +883,7 @@ and other resources, etc.
  </chapter>

  <chapter id="ataExceptions">
     <title>ATA errors &amp; exceptions</title>
     <title>ATA errors and exceptions</title>

  <para>
  This chapter tries to identify what error/exception conditions exist
+4 −0
Original line number Diff line number Diff line
@@ -72,3 +72,7 @@ kernel patches.

    If the new code is substantial, addition of subsystem-specific fault
    injection might be appropriate.

22: Newly-added code has been compiled with `gcc -W'.  This will generate
    lots of noise, but is good for finding bugs like "warning: comparison
    between signed and unsigned".
+3 −3
Original line number Diff line number Diff line
@@ -134,9 +134,9 @@ Do not send more than 15 patches at once to the vger mailing lists!!!


Linus Torvalds is the final arbiter of all changes accepted into the
Linux kernel.  His e-mail address is <torvalds@osdl.org>.  He gets
a lot of e-mail, so typically you should do your best to -avoid- sending
him e-mail.
Linux kernel.  His e-mail address is <torvalds@linux-foundation.org>. 
He gets a lot of e-mail, so typically you should do your best to -avoid-
sending him e-mail. 

Patches which are bug fixes, are "obvious" changes, or similarly
require little discussion should be sent or CC'd to Linus.  Patches
+7 −0
Original line number Diff line number Diff line
@@ -318,3 +318,10 @@ Why: /proc/acpi/button has been replaced by events to the input layer
Who:	Len Brown <len.brown@intel.com>

---------------------------

What:	JFFS (version 1)
When:	2.6.21
Why:	Unmaintained for years, superceded by JFFS2 for years.
Who:	Jeff Garzik <jeff@garzik.org>

---------------------------
Loading