linux/drivers/net/ethernet/hisilicon
Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts
Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>
2017-11-07 10:32:44 +01:00
..
hns License cleanup: add SPDX license identifiers to some files 2017-11-02 10:04:46 -07:00
hns3 net: hns3: Fix an error handling path in 'hclge_rss_init_hw()' 2017-10-01 22:57:24 -07:00
hip04_eth.c locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE() 2017-10-25 11:01:08 +02:00
hisi_femac.c drivers: net: generalize napi_complete_done() 2017-01-30 15:10:42 -05:00
hix5hd2_gmac.c drivers: net: generalize napi_complete_done() 2017-01-30 15:10:42 -05:00
hns_mdio.c net: hns: Fix a wrong op phy C45 code 2017-07-08 11:05:21 +01:00
Kconfig net: hns3: Add HNS3 driver to kernel build framework & MAINTAINERS 2017-08-03 15:08:18 -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