diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-06-04 10:28:20 -0300 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2018-06-04 10:28:20 -0300 |
| commit | 7869e5889477e4e32e4024d665431b35e8b7b693 (patch) | |
| tree | bd1b6c00359ef7f26efc1f6b0ad9771a3d849f65 /Documentation | |
| parent | 9aae1780e7e81e54edfb70ba33ead5b0b48be009 (diff) | |
| parent | 4e9ae0d3d5bf4e2f1b466ba451bd18f2c5b69845 (diff) | |
Merge remote-tracking branch 'tip/perf/urgent' into perf/core
To pick up fixes.
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/net/dsa/b53.txt | 1 | ||||
| -rw-r--r-- | Documentation/i2c/busses/i2c-ocores | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/net/dsa/b53.txt b/Documentation/devicetree/bindings/net/dsa/b53.txt index 8acf51a4dfa8..47a6a7fe0b86 100644 --- a/Documentation/devicetree/bindings/net/dsa/b53.txt +++ b/Documentation/devicetree/bindings/net/dsa/b53.txt @@ -10,6 +10,7 @@ Required properties: "brcm,bcm53128" "brcm,bcm5365" "brcm,bcm5395" + "brcm,bcm5389" "brcm,bcm5397" "brcm,bcm5398" diff --git a/Documentation/i2c/busses/i2c-ocores b/Documentation/i2c/busses/i2c-ocores index c269aaa2f26a..9e1dfe7553ad 100644 --- a/Documentation/i2c/busses/i2c-ocores +++ b/Documentation/i2c/busses/i2c-ocores @@ -2,7 +2,7 @@ Kernel driver i2c-ocores Supported adapters: * OpenCores.org I2C controller by Richard Herveille (see datasheet link) - Datasheet: http://www.opencores.org/projects.cgi/web/i2c/overview + https://opencores.org/project/i2c/overview Author: Peter Korsgaard <jacmet@sunsite.dk> |