Skip to content

Commit

Permalink
Auto merge with /home/aegl/GIT/linus
Browse files Browse the repository at this point in the history
  • Loading branch information
Tony Luck committed Jun 15, 2005
2 parents 325a479 + 1016888 commit f2cbb4f
Show file tree
Hide file tree
Showing 1,219 changed files with 51,542 additions and 22,024 deletions.
13 changes: 4 additions & 9 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 Expand Up @@ -2476,13 +2475,9 @@ S: Potsdam, New York 13676
S: USA

N: Dave Neuer
E: dneuer@innovation-charter.com
E: mr_fred_smoothie@yahoo.com
E: dave.neuer@pobox.com
D: Helped implement support for Compaq's H31xx series iPAQs
D: Other mostly minor tweaks & bugfixes
S: 325 E. Main St., Suite 3
S: Carnegie, PA 15105
S: USA

N: Michael Neuffer
E: mike@i-Connect.Net
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 f2cbb4f

Please sign in to comment.