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

Commit 71095615 authored by Russell King's avatar Russell King
Browse files

Merge branches 'fixes' and 'misc' into for-next 

Conflicts:
	arch/arm/kernel/iwmmxt.S
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/mmu.c
parents 6bf755db 3bb70de6

CREDITS

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,10 @@ 
			Linus

----------



M: Matt Mackal

E: mpm@selenic.com

D: SLOB slab allocator



N: Matti Aarnio

E: mea@nic.funet.fi

D: Alpha systems hacking, IPv6 and other network related stuff

Documentation/accounting/getdelays.c

+1 −0
Original line number Diff line number Diff line
@@ -314,6 +314,7 @@ int main(int argc, char *argv[]) 
			break;

		case 'm':

			strncpy(cpumask, optarg, sizeof(cpumask));

			cpumask[sizeof(cpumask) - 1] = '\0';

			maskset = 1;

			printf("cpumask %s maskset %d\n", cpumask, maskset);

			break;

Documentation/devicetree/bindings/arm/armada-38x.txt

+12 −2
Original line number Diff line number Diff line
@@ -6,5 +6,15 @@ following property: 


Required root node property:



 - compatible: must contain either "marvell,armada380" or

   "marvell,armada385" depending on the variant of the SoC being used.
 
 - compatible: must contain "marvell,armada380"



In addition, boards using the Marvell Armada 385 SoC shall have the

following property before the previous one:



Required root node property:



compatible: must contain "marvell,armada385"



Example:



compatible = "marvell,a385-rd", "marvell,armada385", "marvell,armada380";

Documentation/devicetree/bindings/arm/samsung/exynos-adc.txt

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ adc@12D10000 { 


	/* NTC thermistor is a hwmon device */

	ncp15wb473@0 {

		compatible = "ntc,ncp15wb473";

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;

Documentation/devicetree/bindings/hwmon/ntc_thermistor.txt

+14 −6
Original line number Diff line number Diff line
@@ -3,11 +3,19 @@ NTC Thermistor hwmon sensors 


Requires node properties:

- "compatible" value : one of

	"ntc,ncp15wb473"

	"ntc,ncp18wb473"

	"ntc,ncp21wb473"

	"ntc,ncp03wb473"

	"ntc,ncp15wl333"

	"murata,ncp15wb473"

	"murata,ncp18wb473"

	"murata,ncp21wb473"

	"murata,ncp03wb473"

	"murata,ncp15wl333"



/* Usage of vendor name "ntc" is deprecated */

<DEPRECATED>	"ntc,ncp15wb473"

<DEPRECATED>	"ntc,ncp18wb473"

<DEPRECATED>	"ntc,ncp21wb473"

<DEPRECATED>	"ntc,ncp03wb473"

<DEPRECATED>	"ntc,ncp15wl333"



- "pullup-uv"	Pull up voltage in micro volts

- "pullup-ohm"	Pull up resistor value in ohms

- "pulldown-ohm" Pull down resistor value in ohms
@@ -21,7 +29,7 @@ Read more about iio bindings at 


Example:

	ncp15wb473@0 {

		compatible = "ntc,ncp15wb473";

		compatible = "murata,ncp15wb473";

		pullup-uv = <1800000>;

		pullup-ohm = <47000>;

		pulldown-ohm = <0>;