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

Commit b7f797cb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'for-tip' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu into x86/urgent

parents 99bd0c0f 0017c869

Documentation/kernel-parameters.txt

+6 −0
Original line number Diff line number Diff line
@@ -1882,6 +1882,12 @@ and is between 256 and 4096 characters. It is defined in the file 
			Format: { 0 | 1 }

			See arch/parisc/kernel/pdc_chassis.c



	percpu_alloc=	[X86] Select which percpu first chunk allocator to use.

			Allowed values are one of "lpage", "embed" and "4k".

			See comments in arch/x86/kernel/setup_percpu.c for

			details on each allocator.  This parameter is primarily

			for debugging and performance comparison.



	pf.		[PARIDE]

			See Documentation/blockdev/paride.txt.

Documentation/powerpc/dts-bindings/fsl/esdhc.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Required properties: 
  - interrupts : should contain eSDHC interrupt.

  - interrupt-parent : interrupt source phandle.

  - clock-frequency : specifies eSDHC base clock frequency.

  - sdhci,1-bit-only : (optional) specifies that a controller can

    only handle 1-bit data transfers.



Example:

Documentation/sound/alsa/HD-Audio-Models.txt

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ ALC883/888 
  acer		Acer laptops (Travelmate 3012WTMi, Aspire 5600, etc)

  acer-aspire	Acer Aspire 9810

  acer-aspire-4930g Acer Aspire 4930G

  acer-aspire-6530g Acer Aspire 6530G

  acer-aspire-8930g Acer Aspire 8930G

  medion	Medion Laptops

  medion-md2	Medion MD2

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,13 @@ W: http://www.at91.com/ 
S:	Maintained

F:	drivers/mmc/host/at91_mci.c



ATMEL AT91 / AT32 MCI DRIVER

P:	Nicolas Ferre

M:	nicolas.ferre@atmel.com

S:	Maintained

F:	drivers/mmc/host/atmel-mci.c

F:	drivers/mmc/host/atmel-mci-regs.h



ATMEL AT91 / AT32 SERIAL DRIVER

P:	Haavard Skinnemoen

M:	hskinnemoen@atmel.com
@@ -5094,6 +5101,13 @@ L: sdhci-devel@lists.ossman.eu 
S:	Maintained

F:	drivers/mmc/host/sdhci.*



SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER

P:	Ben Dooks

M:	ben-linux@fluff.org

L:	sdhci-devel@lists.ossman.eu

S:	Maintained

F:	drivers/mmc/host/sdhci-s3c.c



SECURITY SUBSYSTEM

P:	James Morris

M:	jmorris@namei.org
@@ -6216,6 +6230,14 @@ S: Maintained 
F:	Documentation/i2c/busses/i2c-viapro

F:	drivers/i2c/busses/i2c-viapro.c



VIA SD/MMC CARD CONTROLLER DRIVER

P:	Joseph Chan

M:	JosephChan@via.com.tw

P:	Harald Welte

M:	HaraldWelte@viatech.com

S:	Maintained

F:	drivers/mmc/host/via-sdmmc.c



VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER

P:	Joseph Chan

M:	JosephChan@via.com.tw

arch/alpha/mm/fault.c

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr, 
	/* If for any reason at all we couldn't handle the fault,

	   make sure we exit gracefully rather than endlessly redo

	   the fault.  */

	fault = handle_mm_fault(mm, vma, address, cause > 0);

	fault = handle_mm_fault(mm, vma, address, cause > 0 ? FAULT_FLAG_WRITE : 0);

	up_read(&mm->mmap_sem);

	if (unlikely(fault & VM_FAULT_ERROR)) {

		if (fault & VM_FAULT_OOM)