diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2017-02-06 17:40:50 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2017-02-06 17:40:50 +0100 |
| commit | bda50db88b8cd00aaeb5d22d3e6f887b7f06b545 (patch) | |
| tree | e3184acfefa80e8660c04973054dfd165bbac48a /Documentation/devicetree/bindings/vendor-prefixes.txt | |
| parent | f6fbb582473b73b4eaee21e7f9299b9d15539971 (diff) | |
| parent | 5aff1d245e8cc1ab5c4517d916edaed9e3f7f973 (diff) | |
Merge branch 'fixes' into for-next
* fixes:
ARM: defconfigs: make NF_CT_PROTO_SCTP and NF_CT_PROTO_UDPLITE built-in
MAINTAINERS: socfpga: update email for Dinh Nguyen
ARM: orion5x: fix Makefile for linkstation-lschl.dtb
ARM: dts: orion5x-lschl: More consistent naming on linkstation series
ARM: dts: orion5x-lschl: Fix model name
Diffstat (limited to 'Documentation/devicetree/bindings/vendor-prefixes.txt')
0 files changed, 0 insertions, 0 deletions