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

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

Merge branch 'linus' into sched/core, to pick up fixes 



Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 14a7405b 1b88accf

.gitignore

+4 −0
Original line number Diff line number Diff line
@@ -127,3 +127,7 @@ all.config 


# Kdevelop4

*.kdev4



#Automatically generated by ASN.1 compiler

net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c

net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

Documentation/PCI/pci.txt

+3 −1
Original line number Diff line number Diff line
@@ -570,7 +570,9 @@ your driver if they're helpful, or just use plain hex constants. 
The device IDs are arbitrary hex numbers (vendor controlled) and normally used

only in a single location, the pci_device_id table.



Please DO submit new vendor/device IDs to http://pciids.sourceforge.net/.

Please DO submit new vendor/device IDs to http://pci-ids.ucw.cz/.

There are mirrors of the pci.ids file at http://pciids.sourceforge.net/

and https://github.com/pciutils/pciids.

Documentation/devicetree/bindings/eeprom/at24.txt

+1 −1
Original line number Diff line number Diff line
@@ -38,9 +38,9 @@ Required properties: 


                "catalyst",

                "microchip",

                "nxp",

                "ramtron",

                "renesas",

                "nxp",

                "st",



                Some vendors use different model names for chips which are just

Documentation/devicetree/bindings/interrupt-controller/renesas,irqc.txt

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ Required properties: 
    - "renesas,irqc-r8a7794" (R-Car E2)

    - "renesas,intc-ex-r8a7795" (R-Car H3)

    - "renesas,intc-ex-r8a7796" (R-Car M3-W)

    - "renesas,intc-ex-r8a77965" (R-Car M3-N)

    - "renesas,intc-ex-r8a77970" (R-Car V3M)

    - "renesas,intc-ex-r8a77995" (R-Car D3)

- #interrupt-cells: has to be <2>: an interrupt index and flags, as defined in