David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
emac	net: qcom/emac: Add missing of_node_put()	2018-06-14 17:01:05 -07:00
rmnet	net: drivers/net: Convert random_ether_addr to eth_random_addr	2018-06-23 10:49:14 +09:00
Kconfig	drivers: net: ethernet: qualcomm: rmnet: Initial implementation	2017-08-30 11:41:13 -07:00
Makefile	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
qca_7k.c	net: qualcomm: move qcaspi_tx_cmd to qca_spi.c	2017-05-30 13:57:29 -04:00
qca_7k.h	net: qualcomm: move qcaspi_tx_cmd to qca_spi.c	2017-05-30 13:57:29 -04:00
qca_7k_common.c	net: qualcomm: make qca_7k_common a separate kernel module	2017-05-30 13:57:30 -04:00
qca_7k_common.h	net: qualcomm: add QCA7000 UART driver	2017-05-30 13:57:32 -04:00
qca_debug.c	ethernet: Use octal not symbolic permissions	2018-03-26 12:07:49 -04:00
qca_debug.h
qca_spi.c	net: qca_spi: Fix log level if probe fails	2018-07-18 15:19:08 -07:00
qca_spi.h	net: qualcomm: rename qca_framing.c to qca_7k_common.c	2017-05-30 13:57:30 -04:00
qca_uart.c	net: qualcomm: add QCA7000 UART driver	2017-05-30 13:57:32 -04:00