diff options
author | David S. Miller <davem@davemloft.net> | 2017-06-30 18:43:08 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2017-06-30 18:43:08 +0200 |
commit | b07911593719828cac023bdcf6bf4da1c9ba546f (patch) | |
tree | c4d2f66e6f2506e5b5439ffca0449e646f677b33 /drivers/i2c/busses/i2c-jz4780.c | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next (diff) | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
download | linux-b07911593719828cac023bdcf6bf4da1c9ba546f.tar.xz linux-b07911593719828cac023bdcf6bf4da1c9ba546f.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
A set of overlapping changes in macvlan and the rocker
driver, nothing serious.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/i2c/busses/i2c-jz4780.c')
0 files changed, 0 insertions, 0 deletions