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

Commit a4da0628 authored Oct 28, 2005 by Roland Dreier

Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

parents 70a30e16 20731945

CREDITS

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -2247,6 +2247,12 @@ S: 249 Nichols Avenue
	S: Syracuse, New York 13206		S: Syracuse, New York 13206
	S: USA		S: USA

			N: Kyle McMartin
			E: kyle@parisc-linux.org
			D: Linux/PARISC hacker
			D: AD1889 sound driver
			S: Ottawa, Canada

	N: Dirk Melchers		N: Dirk Melchers
	E: dirk@merlin.nbg.sub.org		E: dirk@merlin.nbg.sub.org
	D: 8 bit XT hard disk driver for OMTI5520		D: 8 bit XT hard disk driver for OMTI5520

Documentation/Changes

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -65,7 +65,7 @@ o isdn4k-utils 3.1pre1 # isdnctrl 2>&1\|grep version
	o nfs-utils 1.0.5 # showmount --version		o nfs-utils 1.0.5 # showmount --version
	o procps 3.2.0 # ps --version		o procps 3.2.0 # ps --version
	o oprofile 0.9 # oprofiled --version		o oprofile 0.9 # oprofiled --version
	o udev 058 # udevinfo -V		o udev 071 # udevinfo -V

	Kernel compilation		Kernel compilation
	==================		==================