Commit 0ce49a39 authored by Paul Mackerras's avatar Paul Mackerras
Browse files

Merge branch 'linux-2.6'

parents 9e4859ef a88a8eff
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ To solve this problem, you really only have two options:
The option of being unfailingly polite really doesn't exist. Nobody will
trust somebody who is so clearly hiding his true character.

(*) Paul Simon sang "Fifty Ways to Lose Your Lover", because quite
(*) Paul Simon sang "Fifty Ways to Leave Your Lover", because quite
frankly, "A Million Ways to Tell a Developer He Is a D*ckhead" doesn't
scan nearly as well.  But I'm sure he thought about it. 

+8 −0
Original line number Diff line number Diff line
@@ -298,3 +298,11 @@ Why: All mthca hardware also supports MSI-X, which provides
Who:	Roland Dreier <rolandd@cisco.com>

---------------------------

What:   sk98lin network driver
When:   Feburary 2008
Why:    In kernel tree version of driver is unmaintained. Sk98lin driver
	replaced by the skge driver. 
Who:    Stephen Hemminger <shemminger@linux-foundation.org>

---------------------------
+0 −3
Original line number Diff line number Diff line
@@ -468,9 +468,6 @@ and is between 256 and 4096 characters. It is defined in the file
			Format:
			<first_slot>,<last_slot>,<port>,<enum_bit>[,<debug>]

	cpia_pp=	[HW,PPT]
			Format: { parport<nr> | auto | none }

	crashkernel=nn[KMG]@ss[KMG]
			[KNL] Reserve a chunk of physical memory to
			hold a kernel to switch to with kexec on panic.
+3 −0
Original line number Diff line number Diff line
@@ -96,6 +96,9 @@ routing.txt
	- the new routing mechanism
shaper.txt
	- info on the module that can shape/limit transmitted traffic.
sk98lin.txt
	- Marvell Yukon Chipset / SysKonnect SK-98xx compliant Gigabit
	  Ethernet Adapter family driver info
skfp.txt
	- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.
smc9.txt
+568 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading