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

Commit 9b8d90b9 authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 644a918d d7933ab7

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/DocBook/media/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -202,8 +202,8 @@ $(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64 


$(MEDIA_OBJ_DIR)/v4l2.xml: $(OBJIMGFILES)

	@$($(quiet)gen_xml)

	@(ln -sf $(MEDIA_SRC_DIR)/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf $(MEDIA_SRC_DIR)/dvb/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/v4l/*xml $(MEDIA_OBJ_DIR)/)

	@(ln -sf `cd $(MEDIA_SRC_DIR) && /bin/pwd`/dvb/*xml $(MEDIA_OBJ_DIR)/)



$(MEDIA_OBJ_DIR)/videodev2.h.xml: $(srctree)/include/uapi/linux/videodev2.h $(MEDIA_OBJ_DIR)/v4l2.xml

	@$($(quiet)gen_xml)

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>;