Merge branches 'devel-stable', 'entry', 'fixes', 'mach-types', 'misc' and... (946342d0) · Commits · e / devices / android_kernel_xiaomi_markw

CREDITS

+8 −0

Original line number	Diff line number	Diff line
		@@ -1510,6 +1510,14 @@ D: Natsemi ethernet
		D: Cobalt Networks (x86) support
		D: This-and-That

		N: Mark M. Hoffman
		E: mhoffman@lightlink.com
		D: asb100, lm93 and smsc47b397 hardware monitoring drivers
		D: hwmon subsystem core
		D: hwmon subsystem maintainer
		D: i2c-sis96x and i2c-stub SMBus drivers
		S: USA

		N: Dirk Hohndel
		E: hohndel@suse.de
		D: The XFree86[tm] Project

Documentation/DocBook/device-drivers.tmpl

+1 −1

Original line number	Diff line number	Diff line
		@@ -227,7 +227,7 @@ X!Isound/sound_firmware.c
		<chapter id="uart16x50">
		<title>16x50 UART Driver</title>
		!Edrivers/tty/serial/serial_core.c
		!Edrivers/tty/serial/8250/8250.c
		!Edrivers/tty/serial/8250/8250_core.c
		</chapter>

		<chapter id="fbdev">

Documentation/hwmon/lm75

+1 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,7 @@ Supported chips:
		Datasheet: Publicly available at the Maxim website
		http://www.maxim-ic.com/
		* Microchip (TelCom) TCN75
		Prefix: 'lm75'
		Prefix: 'tcn75'
		Addresses scanned: none
		Datasheet: Publicly available at the Microchip website
		http://www.microchip.com/

Documentation/i2c/busses/i2c-diolan-u2c

+1 −1

Original line number	Diff line number	Diff line
		@@ -5,7 +5,7 @@ Supported adapters:
		Documentation:
		http://www.diolan.com/i2c/u2c12.html

		Author: Guenter Roeck <guenter.roeck@ericsson.com>
		Author: Guenter Roeck <linux@roeck-us.net>

		Description
		-----------

Documentation/kernel-parameters.txt

+26 −3

Original line number	Diff line number	Diff line
		@@ -596,9 +596,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		is selected automatically. Check
		Documentation/kdump/kdump.txt for further details.

		crashkernel_low=size[KMG]
		[KNL, x86] parts under 4G.

		crashkernel=range1:size1[,range2:size2,...][@offset]
		[KNL] Same as above, but depends on the memory
		in the running system. The syntax of range is
		@@ -606,6 +603,26 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		a memory unit (amount[KMG]). See also
		Documentation/kdump/kdump.txt for an example.

		crashkernel=size[KMG],high
		[KNL, x86_64] range could be above 4G. Allow kernel
		to allocate physical memory region from top, so could
		be above 4G if system have more than 4G ram installed.
		Otherwise memory region will be allocated below 4G, if
		available.
		It will be ignored if crashkernel=X is specified.
		crashkernel=size[KMG],low
		[KNL, x86_64] range under 4G. When crashkernel=X,high
		is passed, kernel could allocate physical memory region
		above 4G, that cause second kernel crash on system
		that require some amount of low memory, e.g. swiotlb
		requires at least 64M+32K low memory. Kernel would
		try to allocate 72M below 4G automatically.
		This one let user to specify own low range under 4G
		for second kernel instead.
		0: to disable low allocation.
		It will be ignored when crashkernel=X,high is not used
		or memory reserved is below 4G.

		cs89x0_dma= [HW,NET]
		Format: <dma>

		@@ -788,6 +805,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
		edd= [EDD]
		Format: {"off" \| "on" \| "skip[mbr]"}

		efi_no_storage_paranoia [EFI; X86]
		Using this parameter you can use more than 50% of
		your efi variable storage. Use this parameter only if
		you are really sure that your UEFI does sane gc and
		fulfills the spec otherwise your board may brick.

		eisa_irq_edge= [PARISC,HW]
		See header of drivers/parisc/eisa.c.