Merge branch 'linux-2.6'

			Format: <area>[,<node>]

			See also Documentation/networking/decnet.txt.

	default_blu=	[VT]

	vt.default_blu=	[VT]

			Format: <blue0>,<blue1>,<blue2>,...,<blue15>

			Change the default blue palette of the console.

			This is a 16-member array composed of values

			ranging from 0-255.

	default_grn=	[VT]

	vt.default_grn=	[VT]

			Format: <green0>,<green1>,<green2>,...,<green15>

			Change the default green palette of the console.

			This is a 16-member array composed of values

			ranging from 0-255.

	default_red=	[VT]

	vt.default_red=	[VT]

			Format: <red0>,<red1>,<red2>,...,<red15>

			Change the default red palette of the console.

			This is a 16-member array composed of values

			ranging from 0-255.

	default_utf8=   [VT]

	vt.default_utf8=

			[VT]

			Format=<0|1>

			Set system-wide default UTF-8 mode for all tty's.

			Default is 0 and by setting to 1, it enables UTF-8

			mode for all newly opened or allocated terminals.

			Default is 1, i.e. UTF-8 mode is enabled for all

			newly opened terminals.

	dhash_entries=	[KNL]

			Set number of hash buckets for dentry cache.

	lapic_timer_c2_ok	[X86-32,x86-64,APIC] trust the local apic timer in

			C2 power state.

	libata.dma=	[LIBATA] DMA control

			libata.dma=0	  Disable all PATA and SATA DMA

			libata.dma=1	  PATA and SATA Disk DMA only

			libata.dma=2	  ATAPI (CDROM) DMA only

			libata.dma=4	  Compact Flash DMA only 

			Combinations also work, so libata.dma=3 enables DMA

			for disks and CDROMs, but not CFs.

	libata.noacpi	[LIBATA] Disables use of ACPI in libata suspend/resume

			when set.

			Format: <int>

typedef struct { atomic_long_t a; } local_t;

* Rules to follow when using local atomic operations

- Variables touched by local ops must be per cpu variables.

- _Only_ the CPU owner of these variables must write to them.

- This CPU can use local ops from any context (process, irq, softirq, nmi, ...)

  to update its local_t variables.

- Preemption (or interrupts) must be disabled when using local ops in

  process context to   make sure the process won't be migrated to a

  different CPU between getting the per-cpu variable and doing the

  actual local op.

- When using local ops in interrupt context, no special care must be

  taken on a mainline kernel, since they will run on the local CPU with

  preemption already disabled. I suggest, however, to explicitly

  disable preemption anyway to make sure it will still work correctly on

  -rt kernels.

- Reading the local cpu variable will provide the current copy of the

  variable.

- Reads of these variables can be done from any CPU, because updates to

  "long", aligned, variables are always atomic. Since no memory

  synchronization is done by the writer CPU, an outdated copy of the

  variable can be read when reading some _other_ cpu's variables.

* Rules to follow when using local atomic operations

- Variables touched by local ops must be per cpu variables.

2) Do not forget to update netdev->trans_start to jiffies after

   each new tx packet is given to the hardware.

3) Do not forget that once you return 0 from your hard_start_xmit

3) A hard_start_xmit method must not modify the shared parts of a

   cloned SKB.

4) Do not forget that once you return 0 from your hard_start_xmit

   method, it is your driver's responsibility to free up the SKB

   and in some finite amount of time.

"wavelan" driver (old ISA Wavelan)

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

	o Config :	Network device -> Wireless LAN -> AT&T WaveLAN

	o Location :	.../drivers/net/wavelan*

	o in-line doc :	.../drivers/net/wavelan.p.h

	o Location :	.../drivers/net/wireless/wavelan*

	o in-line doc :	.../drivers/net/wireless/wavelan.p.h

	o on-line doc :

	    http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Wavelan.html

  autoconfiguration will take place.  The most common way to use this

  is "ip=dhcp".

  Note that "ip=off" is not the same thing as "ip=::::::off", because in

  the latter autoconfiguration will take place if any of DHCP, BOOTP or RARP

  are compiled in the kernel.

  <client-ip>	IP address of the client.

  		Default:  Determined using autoconfiguration.

		this option.

                  off or none: don't use autoconfiguration

				(do static IP assignment instead)

		  on or any:   use any protocol available in the kernel

			       (default)

		  dhcp:        use DHCP

		  bootp:       use BOOTP

		  rarp:        use RARP