You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/emulex/benet/be_main.c net/core/sysctl_net_core.c net/ipv4/inet_diag.c The be_main.c conflict resolution was really tricky. The conflict hunks generated by GIT were very unhelpful, to say the least. It split functions in half and moved them around, when the real actual conflict only existed solely inside of one function, that being be_map_pci_bars(). So instead, to resolve this, I checked out be_main.c from the top of net-next, then I applied the be_main.c changes from 'net' since the last time I merged. And this worked beautifully. The inet_diag.c and sysctl_net_core.c conflicts were simple overlapping changes, and were easily to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		10 years ago
..
Kconfig	…
Makefile	…
caif_dev.c	net: Include appropriate header file in caif/caif_dev.c	11 years ago
caif_socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	10 years ago
caif_usb.c	caif_usb: use target structure member in memset	10 years ago
cfcnfg.c	caif: Remove my bouncing email address.	12 years ago
cfctrl.c	caif: remove unnecessary break after goto	11 years ago
cfdbgl.c	caif: Remove my bouncing email address.	12 years ago
cfdgml.c	caif: Remove my bouncing email address.	12 years ago
cffrml.c	caif: fix a signedness bug in cfpkt_iterate()	10 years ago
cfmuxl.c	caif: replace kmalloc/memset 0 by kzalloc	10 years ago
cfpkt_skbuff.c	caif: fix a signedness bug in cfpkt_iterate()	10 years ago
cfrfml.c	caif: Remove my bouncing email address.	12 years ago
cfserl.c	caif: Remove my bouncing email address.	12 years ago
cfsrvl.c	net: Include appropriate header file in caif/cfsrvl.c	11 years ago
cfutill.c	caif: Remove my bouncing email address.	12 years ago
cfveil.c	caif: Remove my bouncing email address.	12 years ago
cfvidl.c	caif: Remove my bouncing email address.	12 years ago
chnl_net.c	caif: remove wrong dev_net_set() call	10 years ago