OpenCloudOS-Kernel/drivers/net/ethernet/ibm/ehea
David S. Miller 6f41617bf2 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Minor conflict in net/core/rtnetlink.c, David Ahern's bug fix in 'net'
overlapped the renaming of a netlink attribute in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-10-03 21:00:17 -07:00
..
Makefile net: ethernet: ibm: ehea: Remove duplicate object from Makefile 2014-08-14 14:38:54 -07:00
ehea.h ehea: Remove uses of virt_to_abs() and abs_to_virt() 2012-09-05 15:18:46 +10:00
ehea_ethtool.c net: ibm: ehea: use new api ethtool_{get|set}_link_ksettings 2017-01-09 12:09:09 -05:00
ehea_hw.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00
ehea_main.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2018-10-03 21:00:17 -07:00
ehea_phyp.c ehea: Remove uses of virt_to_abs() and abs_to_virt() 2012-09-05 15:18:46 +10:00
ehea_phyp.h powerpc: Move get_longbusy_msecs into hvcall.h and remove duplicate function 2012-11-15 15:08:07 +11:00
ehea_qmr.c net: ibm: remove redundant local variables 'act_nr_of_entries' and 'act_pages' 2018-09-19 21:26:40 -07:00
ehea_qmr.h drivers/net: fix up stale paths from driver reorg 2012-01-30 12:54:40 -05:00