Commit b3e3b302 authored Mar 23, 2009 by Ingo Molnar

Merge branches 'irq/sparseirq' and 'linus' into irq/core

parents a6bc3262 59fcbdda

CREDITS

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -3738,7 +3738,7 @@ S: 93149 Nittenau
	S: Germany		S: Germany

	N: Gertjan van Wingerde		N: Gertjan van Wingerde
	E: gwingerde@home.nl		E: gwingerde@gmail.com
	D: Ralink rt2x00 WLAN driver		D: Ralink rt2x00 WLAN driver
	D: Minix V2 file-system		D: Minix V2 file-system
	D: Misc fixes		D: Misc fixes

Documentation/logo.gif

deleted100644 → 0

−16 KiB

Loading image diff...

Documentation/logo.svg

0 → 100644

+2911 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/logo.txt

+3 −12

Original line number	Original line	Diff line number	Diff line
	This is the full-colour version of the currently unofficial Linux logo		Tux is taking a three month sabbatical to work as a barber, so Tuz is
	("currently unofficial" just means that there has been no paperwork and		standing in. He's taken pains to ensure you'll hardly notice.
	that I have not really announced it yet). It was created by Larry Ewing,
	and is freely usable as long as you acknowledge Larry as the original
	artist.

	Note that there are black-and-white versions of this available that
	scale down to smaller sizes and are better for letterheads or whatever
	you want to use it for: for the full range of logos take a look at
	Larry's web-page:

	http://www.isc.tamu.edu/~lewing/linux/

			Image by Andrew McGown and Josh Bush. Image is licensed CC BY-SA.

MAINTAINERS

+9 −0

Original line number	Original line	Diff line number	Diff line
	@@ -3876,6 +3876,15 @@ L: linux-ide@vger.kernel.org
	T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git		T: git kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git
	S: Supported		S: Supported

			SERVER ENGINES 10Gbps NIC - BladeEngine 2 DRIVER
			P: Sathya Perla
			M: sathyap@serverengines.com
			P: Subbu Seetharaman
			M: subbus@serverengines.com
			L: netdev@vger.kernel.org
			W: http://www.serverengines.com
			S: Supported

	SFC NETWORK DRIVER		SFC NETWORK DRIVER
	P: Steve Hodgson		P: Steve Hodgson
	P: Ben Hutchings		P: Ben Hutchings