David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/nfc/microread/mei.c net/netfilter/nfnetlink_queue_core.c Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which some cleanups are going to go on-top. Signed-off-by: David S. Miller <davem@davemloft.net>		2013-04-07 18:37:01 -04:00
..
caif_dev.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
caif_socket.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2013-04-07 18:37:01 -04:00
caif_usb.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfcnfg.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfctrl.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05: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	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfmuxl.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfpkt_skbuff.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfrfml.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfserl.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfsrvl.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
cfutill.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
cfveil.c	caif: Remove OOM messages, use kzalloc	2011-08-28 17:16:13 -04:00
cfvidl.c	caif: Fix for a race in socket transmit with flow control.	2012-03-11 15:38:16 -07:00
chnl_net.c	CAIF: fix indentation for function arguments	2013-03-07 16:24:45 -05:00
Kconfig	Kconfig: replace "--- help ---" with "---help---"	2012-05-07 15:01:22 +02:00
Makefile	caif: Add support for CAIF over CDC NCM USB interface	2011-12-05 18:27:56 -05:00