Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Linus Torvalds committed Mar 21, 2006
2 parents e031d33 + 2b42238 commit ba93c62
Show file tree
Hide file tree
Showing 11 changed files with 774 additions and 474 deletions.
18 changes: 0 additions & 18 deletions Documentation/Changes
Original file line number Diff line number Diff line change
Expand Up @@ -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
============================

Expand Down
6 changes: 0 additions & 6 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -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:

Expand Down
Loading

0 comments on commit ba93c62

Please sign in to comment.