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

Commit 0e44e059 authored by Sascha Hauer's avatar Sascha Hauer
Browse files

Merge commit 'v2.6.37-rc4' into imx-for-2.6.38 



Done to resolve merge conflict:

Conflicts:
	arch/arm/mach-mx25/devices-imx25.h

Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parents 96886c43 e8a7e48b

Documentation/DocBook/sh.tmpl

+0 −4
Original line number Diff line number Diff line
@@ -79,10 +79,6 @@ 
      </sect2>

    </sect1>

  </chapter>

  <chapter id="clk">

    <title>Clock Framework Extensions</title>

!Iinclude/linux/sh_clk.h

  </chapter>

  <chapter id="mach">

    <title>Machine Specific Interfaces</title>

    <sect1 id="dreamcast">

Documentation/edac.txt

+4 −4
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ csrow3. 
The representation of the above is reflected in the directory tree

in EDAC's sysfs interface. Starting in directory

/sys/devices/system/edac/mc each memory controller will be represented

by its own 'mcX' directory, where 'X" is the index of the MC.

by its own 'mcX' directory, where 'X' is the index of the MC.





	..../edac/mc/
@@ -207,7 +207,7 @@ by its own 'mcX' directory, where 'X" is the index of the MC. 
		   ....



Under each 'mcX' directory each 'csrowX' is again represented by a

'csrowX', where 'X" is the csrow index:

'csrowX', where 'X' is the csrow index:





	.../mc/mc0/
@@ -232,7 +232,7 @@ EDAC control and attribute files. 




In 'mcX' directories are EDAC control and attribute files for

this 'X" instance of the memory controllers:

this 'X' instance of the memory controllers:





Counter reset control file:
@@ -343,7 +343,7 @@ Sdram memory scrubbing rate: 
'csrowX' DIRECTORIES



In the 'csrowX' directories are EDAC control and attribute files for

this 'X" instance of csrow:

this 'X' instance of csrow:





Total Uncorrectable Errors count attribute file:

Documentation/fb/00-INDEX

+25 −7
Original line number Diff line number Diff line
@@ -4,33 +4,41 @@ please mail me. 
				    Geert Uytterhoeven <geert@linux-m68k.org>



00-INDEX

	- this file

	- this file.

arkfb.txt

	- info on the fbdev driver for ARK Logic chips.

aty128fb.txt

	- info on the ATI Rage128 frame buffer driver.

cirrusfb.txt

	- info on the driver for Cirrus Logic chipsets.

cmap_xfbdev.txt

	- an introduction to fbdev's cmap structures.

deferred_io.txt

	- an introduction to deferred IO.

efifb.txt

	- info on the EFI platform driver for Intel based Apple computers.

ep93xx-fb.txt

	- info on the driver for EP93xx LCD controller.

fbcon.txt

	- intro to and usage guide for the framebuffer console (fbcon).

framebuffer.txt

	- introduction to frame buffer devices.

imacfb.txt

	- info on the generic EFI platform driver for Intel based Macs.

gxfb.txt

	- info on the framebuffer driver for AMD Geode GX2 based processors.

intel810.txt

	- documentation for the Intel 810/815 framebuffer driver.

intelfb.txt

	- docs for Intel 830M/845G/852GM/855GM/865G/915G/945G fb driver.

internals.txt

	- quick overview of frame buffer device internals.

lxfb.txt

	- info on the framebuffer driver for AMD Geode LX based processors.

matroxfb.txt

	- info on the Matrox framebuffer driver for Alpha, Intel and PPC.

metronomefb.txt

	- info on the driver for the Metronome display controller.

modedb.txt

	- info on the video mode database.

matroxfb.txt

	- info on the Matrox frame buffer driver.

pvr2fb.txt

	- info on the PowerVR 2 frame buffer driver.

pxafb.txt
@@ -39,13 +47,23 @@ s3fb.txt 
	- info on the fbdev driver for S3 Trio/Virge chips.

sa1100fb.txt

	- information about the driver for the SA-1100 LCD controller.

sh7760fb.txt

	- info on the SH7760/SH7763 integrated LCDC Framebuffer driver.

sisfb.txt

	- info on the framebuffer device driver for various SiS chips.

sstfb.txt

	- info on the frame buffer driver for 3dfx' Voodoo Graphics boards.

tgafb.txt

	- info on the TGA (DECChip 21030) frame buffer driver

	- info on the TGA (DECChip 21030) frame buffer driver.

tridentfb.txt

	info on the framebuffer driver for some Trident chip based cards.

uvesafb.txt

	- info on the userspace VESA (VBE2+ compliant) frame buffer device.

vesafb.txt

	- info on the VESA frame buffer device

	- info on the VESA frame buffer device.

viafb.modes

	- list of modes for VIA Integration Graphic Chip.

viafb.txt

	- info on the VIA Integration Graphic Chip console framebuffer driver.

vt8623fb.txt

	- info on the fb driver for the graphics core in VIA VT8623 chipsets.

Documentation/kernel-parameters.txt

+5 −0
Original line number Diff line number Diff line
@@ -2385,6 +2385,11 @@ and is between 256 and 4096 characters. It is defined in the file 
			improve throughput, but will also increase the

			amount of memory reserved for use by the client.



	swapaccount[=0|1]

			[KNL] Enable accounting of swap in memory resource

			controller if no parameter or 1 is given or disable

			it if 0 is given (See Documentation/cgroups/memory.txt)



	swiotlb=	[IA-64] Number of I/O TLB slabs



	switches=	[HW,M68k]

Documentation/networking/ip-sysctl.txt

+1 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ tcp_adv_win_scale - INTEGER 
	Count buffering overhead as bytes/2^tcp_adv_win_scale

	(if tcp_adv_win_scale > 0) or bytes-bytes/2^(-tcp_adv_win_scale),

	if it is <= 0.

	Possible values are [-31, 31], inclusive.

	Default: 2



tcp_allowed_congestion_control - STRING