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

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

Merge tag 'l3-fix-for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp into x86/urgent 



A small L3 cache index disable fix from Srivatsa Bhat which unifies the
way the code checks for already disabled indices.

( Pulling it into v3.4 despite the v3.5 tag - the fix is small and we better
  keep the same code across kernel versions for such user facing interfaces. )

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 89b8835e a720b2dd

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

+3 −1
Original line number Diff line number Diff line
@@ -43,7 +43,9 @@ ALC680 


ALC882/883/885/888/889

======================

  N/A

  acer-aspire-4930g	Acer Aspire 4930G/5930G/6530G/6930G/7730G

  acer-aspire-8930g	Acer Aspire 8330G/6935G

  acer-aspire		Acer Aspire others



ALC861/660

==========

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 0

EXTRAVERSION = -rc2

EXTRAVERSION = -rc3

NAME = Saber-toothed Squirrel



# *DOCUMENTATION*

arch/arm/boot/compressed/atags_to_fdt.c

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ int atags_to_fdt(void *atag_list, void *fdt, int total_space) 
		} else if (atag->hdr.tag == ATAG_MEM) {

			if (memcount >= sizeof(mem_reg_property)/4)

				continue;

			if (!atag->u.mem.size)

				continue;

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.start);

			mem_reg_property[memcount++] = cpu_to_fdt32(atag->u.mem.size);

		} else if (atag->hdr.tag == ATAG_INITRD2) {

arch/arm/boot/compressed/head.S

+1 −1
Original line number Diff line number Diff line
@@ -273,7 +273,7 @@ restart: adr r0, LC0 
		add	r0, r0, #0x100

		mov	r1, r6

		sub	r2, sp, r6

		blne	atags_to_fdt

		bleq	atags_to_fdt



		ldmfd	sp!, {r0-r3, ip, lr}

		sub	sp, sp, #0x10000

arch/arm/boot/dts/at91sam9g20.dtsi

+0 −1
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ 
				#interrupt-cells = <2>;

				compatible = "atmel,at91rm9200-aic";

				interrupt-controller;

				interrupt-parent;

				reg = <0xfffff000 0x200>;

			};