David S. Miller
dda922c831
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
...
Conflicts:
drivers/net/phy/amd-xgbe-phy.c
drivers/net/wireless/iwlwifi/Kconfig
include/net/mac80211.h
iwlwifi/Kconfig and mac80211.h were both trivial overlapping
changes.
The drivers/net/phy/amd-xgbe-phy.c file got removed in 'net-next' and
the bug fix that happened on the 'net' side is already integrated
into the rest of the amd-xgbe driver.
Signed-off-by: David S. Miller <davem@davemloft.net>
2015-06-01 22:51:30 -07:00
..
caif_dev.c
net: Include appropriate header file in caif/caif_dev.c
2014-02-09 17:32:49 -08:00
caif_socket.c
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-06-01 22:51:30 -07:00
caif_usb.c
caif_usb: use target structure member in memset
2014-10-14 16:05:45 -04:00
cfcnfg.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cfctrl.c
caif: remove unnecessary break after goto
2014-07-15 16:27:01 -07:00
cfdbgl.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cfdgml.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cffrml.c
caif: fix a signedness bug in cfpkt_iterate()
2015-02-20 17:35:14 -05:00
cfmuxl.c
caif: replace kmalloc/memset 0 by kzalloc
2014-10-14 16:04:07 -04:00
cfpkt_skbuff.c
caif: fix a signedness bug in cfpkt_iterate()
2015-02-20 17:35:14 -05:00
cfrfml.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cfserl.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cfsrvl.c
net: Include appropriate header file in caif/cfsrvl.c
2014-02-09 17:32:49 -08:00
cfutill.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cfveil.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
cfvidl.c
caif: Remove my bouncing email address.
2013-04-23 13:25:51 -04:00
chnl_net.c
caif: remove wrong dev_net_set() call
2015-01-29 14:20:02 -08:00
Kconfig
Makefile