diff options
| author | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
|---|---|---|
| committer | Grant Likely <grant.likely@linaro.org> | 2015-03-29 08:59:58 +0100 |
| commit | a2166ca5f3204794e8b59f01c93a0f1564e3e138 (patch) | |
| tree | b667828c308ffd79f1b2bd8fc1da95e43dfef4e3 /Documentation/devicetree/bindings/i2c | |
| parent | 37791b6fbe7ab772020e714d34515f144fa981a0 (diff) | |
| parent | 01218bf14ee60d4a2d6c667ebdbba3ae9a7a1d66 (diff) | |
Merge remote-tracking branch 'robh/for-next' into devicetree/next
Conflicts:
drivers/of/unittest.c
Diffstat (limited to 'Documentation/devicetree/bindings/i2c')
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt (renamed from Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt) | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt b/Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt index 1b87b741fa8e..1b87b741fa8e 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-bcm-kona.txt +++ b/Documentation/devicetree/bindings/i2c/brcm,kona-i2c.txt |