David S. Miller abaa72d7fd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c		2012-07-19 11:17:30 -07:00
..
caif_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-07-19 11:17:30 -07:00
caif_socket.c	caif: Clear shutdown mask to zero at reconnect.	2012-06-25 16:07:22 -07:00
caif_usb.c
cfcnfg.c
cfctrl.c	caif: Fixed potential memory leak	2012-06-25 16:44:11 -07:00
cfdbgl.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
cfdgml.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
cffrml.c
cfmuxl.c
cfpkt_skbuff.c	caif: set traffic class for caif packets	2012-04-13 11:37:36 -04:00
cfrfml.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
cfserl.c
cfsrvl.c	caif: set traffic class for caif packets	2012-04-13 11:37:36 -04:00
cfutill.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
cfveil.c
cfvidl.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
chnl_net.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-04-13 11:36:48 -04:00
Kconfig	Kconfig: replace "--- help ---" with "---help---"	2012-05-07 15:01:22 +02:00
Makefile