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

Commit 55ba1585 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Merge android-4.4.97 (46d256da) into msm-4.4"

parents 56d2bd6a bb6e8073

Makefile

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

PATCHLEVEL = 4

SUBLEVEL = 96

SUBLEVEL = 97

EXTRAVERSION =

NAME = Blurry Fish Butt

arch/arm/boot/dts/armada-375.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -176,9 +176,9 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-incr = <0>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				arm,double-linefill = <0>;

				prefetch-data = <1>;

			};

arch/arm/boot/dts/armada-38x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -143,9 +143,9 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-incr = <0>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				arm,double-linefill = <0>;

				prefetch-data = <1>;

			};

arch/arm/boot/dts/armada-39x.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -104,9 +104,9 @@ 
				reg = <0x8000 0x1000>;

				cache-unified;

				cache-level = <2>;

				arm,double-linefill-incr = <1>;

				arm,double-linefill-incr = <0>;

				arm,double-linefill-wrap = <0>;

				arm,double-linefill = <1>;

				arm,double-linefill = <0>;

				prefetch-data = <1>;

			};

arch/arm/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -37,4 +37,3 @@ generic-y += termbits.h 
generic-y += termios.h

generic-y += timex.h

generic-y += trace_clock.h
 
generic-y += unaligned.h