summaryrefslogtreecommitdiffstats
path: root/drivers/mfd/da9063-i2c.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2019-08-19 20:54:03 +0200
committerDavid S. Miller <davem@davemloft.net>2019-08-19 20:54:03 +0200
commit446bf64b613c4433dac4b15f4eaf326beaad3c8e (patch)
treeb20b9457234f6f9a5d7464213ef6d10f95f3eed3 /drivers/mfd/da9063-i2c.c
parentnet: hns: add phy_attached_info() to the hns driver (diff)
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net (diff)
downloadlinux-446bf64b613c4433dac4b15f4eaf326beaad3c8e.tar.xz
linux-446bf64b613c4433dac4b15f4eaf326beaad3c8e.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge conflict of mlx5 resolved using instructions in merge commit 9566e650bf7fdf58384bb06df634f7531ca3a97e. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/mfd/da9063-i2c.c')
0 files changed, 0 insertions, 0 deletions