Skip to content

Commit

Permalink
Merge with /home/shaggy/git/linus-clean/
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Kleikamp <shaggy@austin.ibm.com>
  • Loading branch information
Dave Kleikamp committed Jun 2, 2005
2 parents 259692b + 1e86d1c commit 7078253
Show file tree
Hide file tree
Showing 903 changed files with 37,255 additions and 16,627 deletions.
7 changes: 3 additions & 4 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ W: http://tomas.nocrew.org/
D: dsp56k device driver

N: Ross Biro
E: bir7@leland.Stanford.Edu
E: ross.biro@gmail.com
D: Original author of the Linux networking code

N: Anton Blanchard
Expand Down Expand Up @@ -882,13 +882,12 @@ S: Blacksburg, Virginia 24061
S: USA

N: Randy Dunlap
E: rddunlap@osdl.org
E: rdunlap@xenotime.net
W: http://www.xenotime.net/linux/linux.html
W: http://www.linux-usb.org
D: Linux-USB subsystem, USB core/UHCI/printer/storage drivers
D: x86 SMP, ACPI, bootflag hacking
S: 12725 SW Millikan Way, Suite 400
S: Beaverton, Oregon 97005
S: (ask for current address)
S: USA

N: Bob Dunlop
Expand Down
2 changes: 0 additions & 2 deletions Documentation/00-INDEX
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Following translations are available on the WWW:

00-INDEX
- this file.
BK-usage/
- directory with info on BitKeeper.
BUG-HUNTING
- brute force method of doing binary search of patches to find bug.
Changes
Expand Down
51 changes: 0 additions & 51 deletions Documentation/BK-usage/00-INDEX

This file was deleted.

283 changes: 0 additions & 283 deletions Documentation/BK-usage/bk-kernel-howto.txt

This file was deleted.

Loading

0 comments on commit 7078253

Please sign in to comment.