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

Commit 9c7bc451 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

Merge branches 'devel-cleanup', 'devel-serial' and 'devel-board' into omap-for-linus

parents 2862945b 662b083a 1cb125ca

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/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

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -5839,6 +5839,8 @@ M: Chris Metcalf <cmetcalf@tilera.com> 
W:	http://www.tilera.com/scm/

S:	Supported

F:	arch/tile/

F:	drivers/char/hvc_tile.c

F:	drivers/net/tile/



TLAN NETWORK DRIVER

M:	Samuel Chessman <chessman@tux.org>

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 2

PATCHLEVEL = 6

SUBLEVEL = 37

EXTRAVERSION = -rc3

EXTRAVERSION = -rc4

NAME = Flesh-Eating Bats with Fangs



# *DOCUMENTATION*

arch/arm/mach-omap1/Kconfig

+1 −10
Original line number Diff line number Diff line
@@ -152,20 +152,11 @@ config MACH_NOKIA770 
config MACH_AMS_DELTA

	bool "Amstrad E3 (Delta)"

	depends on ARCH_OMAP1 && ARCH_OMAP15XX

	select FIQ

	help

	  Support for the Amstrad E3 (codename Delta) videophone. Say Y here

	  if you have such a device.



config AMS_DELTA_FIQ

	bool "Fast Interrupt Request (FIQ) support for the E3"

	depends on MACH_AMS_DELTA

	select FIQ

	help

	  Provide a FIQ handler for the E3.

	  This allows for fast handling of interrupts generated

	  by the clock line of the E3 mailboard (or a PS/2 keyboard)

	  connected to the GPIO based external keyboard port.



config MACH_OMAP_GENERIC

	bool "Generic OMAP board"

	depends on ARCH_OMAP1 && (ARCH_OMAP15XX || ARCH_OMAP16XX)