diff options
author | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2016-09-12 15:52:44 -0700 |
commit | b20b378d49926b82c0a131492fa8842156e0e8a9 (patch) | |
tree | 7196847eea049a46442b05f99aee1dc571019381 /drivers/iio/humidity/si7020.c | |
parent | 02154927c115c7599677df57203988e05b576346 (diff) | |
parent | da499f8f5385c181e29978fdaab15a58de185302 (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/mediatek/mtk_eth_soc.c
drivers/net/ethernet/qlogic/qed/qed_dcbx.c
drivers/net/phy/Kconfig
All conflicts were cases of overlapping commits.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/iio/humidity/si7020.c')
0 files changed, 0 insertions, 0 deletions