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

Commit ba93c629 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial 

* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial:
  README: bzip2 is not new
  Documentation/Changes: remove outdated translation references
  remove dead Radeon URL
  SCSI_AACRAID: add a help text
  update the i386 defconfig
  MAINTAINERS: remove the LANMEDIA entry
  Move ip2.c and ip2main.c to drivers/char/ip2/ where the other files
parents e031d33e 2b422383

Documentation/Changes

+0 −18
Original line number Diff line number Diff line
@@ -15,24 +15,6 @@ and therefore owes credit to the same people as that file (Jared Mauch, 
Axel Boldt, Alessandro Sigala, and countless other users all over the

'net).



The latest revision of this document, in various formats, can always

be found at <http://cyberbuzz.gatech.edu/kaboom/linux/Changes-2.4/>.



Feel free to translate this document.  If you do so, please send me a

URL to your translation for inclusion in future revisions of this

document.



Smotrite file <http://oblom.rnc.ru/linux/kernel/Changes.ru>, yavlyaushisya

russkim perevodom dannogo documenta.



Visite <http://www2.adi.uam.es/~ender/tecnico/> para obtener la traducción

al español de este documento en varios formatos.



Eine deutsche Version dieser Datei finden Sie unter

<http://www.stefan-winter.de/Changes-2.4.0.txt>.



Chris Ricker (kaboom@gatech.edu or chris.ricker@genetics.utah.edu).



Current Minimal Requirements

============================

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -1524,12 +1524,6 @@ M: davem@davemloft.net 
L:	linux-kernel@vger.kernel.org

S:	Maintained



LANMEDIA WAN CARD DRIVER

P:	Andrew Stanley-Jones

M:	asj@lanmedia.com

W:	http://www.lanmedia.com/

S:	Supported

 

LAPB module

P:	Henner Eisen

M:	eis@baty.hanse.de

README

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ INSTALLING the kernel: 
   whatever the kernel-du-jour happens to be.



 - You can also upgrade between 2.6.xx releases by patching.  Patches are

   distributed in the traditional gzip and the new bzip2 format.  To

   distributed in the traditional gzip and the newer bzip2 format.  To

   install by patching, get all the newer patch files, enter the

   top level directory of the kernel source (linux-2.6.xx) and execute:

arch/i386/defconfig

+741 −431

File changed.

Preview size limit exceeded, changes collapsed.

drivers/char/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ obj-$(CONFIG_MOXA_INTELLIO) += moxa.o 
obj-$(CONFIG_A2232)		+= ser_a2232.o generic_serial.o

obj-$(CONFIG_ATARI_DSP56K)	+= dsp56k.o

obj-$(CONFIG_MOXA_SMARTIO)	+= mxser.o

obj-$(CONFIG_COMPUTONE)		+= ip2.o ip2main.o

obj-$(CONFIG_COMPUTONE)		+= ip2/

obj-$(CONFIG_RISCOM8)		+= riscom8.o

obj-$(CONFIG_ISI)		+= isicom.o

obj-$(CONFIG_SYNCLINK)		+= synclink.o