Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/net/ethernet/intel/e1000e/netdev.c
Minor conflict in e1000e, a line that got fixed in 'net'
has been removed in 'net-next'.
Signed-off-by:
David S. Miller <davem@davemloft.net>
Showing
- CREDITS 3 additions, 3 deletionsCREDITS
- Documentation/SubmittingPatches 1 addition, 2 deletionsDocumentation/SubmittingPatches
- Documentation/hwmon/adm1275 1 addition, 1 deletionDocumentation/hwmon/adm1275
- Documentation/hwmon/adt7410 10 additions, 1 deletionDocumentation/hwmon/adt7410
- Documentation/hwmon/jc42 1 addition, 1 deletionDocumentation/hwmon/jc42
- Documentation/hwmon/lineage-pem 1 addition, 1 deletionDocumentation/hwmon/lineage-pem
- Documentation/hwmon/lm25066 1 addition, 1 deletionDocumentation/hwmon/lm25066
- Documentation/hwmon/ltc2978 3 additions, 3 deletionsDocumentation/hwmon/ltc2978
- Documentation/hwmon/ltc4261 1 addition, 1 deletionDocumentation/hwmon/ltc4261
- Documentation/hwmon/max16064 1 addition, 1 deletionDocumentation/hwmon/max16064
- Documentation/hwmon/max16065 1 addition, 1 deletionDocumentation/hwmon/max16065
- Documentation/hwmon/max34440 1 addition, 1 deletionDocumentation/hwmon/max34440
- Documentation/hwmon/max8688 1 addition, 1 deletionDocumentation/hwmon/max8688
- Documentation/hwmon/pmbus 1 addition, 1 deletionDocumentation/hwmon/pmbus
- Documentation/hwmon/smm665 1 addition, 1 deletionDocumentation/hwmon/smm665
- Documentation/hwmon/ucd9000 1 addition, 1 deletionDocumentation/hwmon/ucd9000
- Documentation/hwmon/ucd9200 1 addition, 1 deletionDocumentation/hwmon/ucd9200
- Documentation/hwmon/zl6100 1 addition, 1 deletionDocumentation/hwmon/zl6100
- Documentation/input/alps.txt 60 additions, 7 deletionsDocumentation/input/alps.txt
- Documentation/networking/tuntap.txt 77 additions, 0 deletionsDocumentation/networking/tuntap.txt
Please register or sign in to comment