diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:36:10 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-02-06 09:36:10 +0100 |
| commit | a769f30c7bd7cf917eea05a2b448f3588a87d767 (patch) | |
| tree | 10a06089a9525926e23675528dd8190d05849143 /Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt | |
| parent | staging: fbtft: fix unaligned parentheses (diff) | |
| parent | Linux 4.10-rc7 (diff) | |
| download | linux-a769f30c7bd7cf917eea05a2b448f3588a87d767.tar.xz linux-a769f30c7bd7cf917eea05a2b448f3588a87d767.zip | |
Merge 4.10-rc7 into staging-next
This resolves the merge errors that were reported in linux-next and it
picks up the staging and IIO fixes that we need/want in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/i2c-cbus-gpio.txt')
0 files changed, 0 insertions, 0 deletions