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

Commit 0ce49a39 authored Sep 20, 2007 by Paul Mackerras

Merge branch 'linux-2.6'

parents 9e4859ef a88a8eff

Documentation/ManagementStyle

+1 −1

Original line number	Original line	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		The option of being unfailingly polite really doesn't exist. Nobody will
	trust somebody who is so clearly hiding his true character.		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		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.		scan nearly as well. But I'm sure he thought about it.

Documentation/feature-removal-schedule.txt

+8 −0

Original line number	Original line	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>		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>

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

Documentation/kernel-parameters.txt

+0 −3

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

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

	crashkernel=nn[KMG]@ss[KMG]		crashkernel=nn[KMG]@ss[KMG]
	[KNL] Reserve a chunk of physical memory to		[KNL] Reserve a chunk of physical memory to
	hold a kernel to switch to with kexec on panic.		hold a kernel to switch to with kexec on panic.

Documentation/networking/00-INDEX

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -96,6 +96,9 @@ routing.txt
	- the new routing mechanism		- the new routing mechanism
	shaper.txt		shaper.txt
	- info on the module that can shape/limit transmitted traffic.		- 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		skfp.txt
	- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.		- SysKonnect FDDI (SK-5xxx, Compaq Netelligent) driver info.
	smc9.txt		smc9.txt

Documentation/networking/sk98lin.txt

0 → 100644

+568 −0

File added.

Preview size limit exceeded, changes collapsed.