David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/caif/caif_hsi.c drivers/net/usb/qmi_wwan.c The qmi_wwan merge was trivial. The caif_hsi.c, on the other hand, was not. It's a conflict between 1c385f1fdf ("caif-hsi: Replace platform device with ops structure.") in the net-next tree and commit 39abbaef19 ("caif-hsi: Postpone init of HIS until open()") in the net tree. I did my best with that one and will ask Sjur to check it out. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-06-28 17:37:00 -07:00
..
caif_dev.c	caif: added check for potential null return	2012-06-25 16:44:11 -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