openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/net/caif
History
David S. Miller 69259abb64 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 
Conflicts:
	drivers/net/pcmcia/pcnet_cs.c
	net/caif/caif_socket.c
 		2010-10-06 19:39:31 -07:00
..
Kconfig caif: Kconfig and Makefile fixes 2010-06-29 00:06:38 -07:00
Makefile caif: Kconfig and Makefile fixes 2010-06-29 00:06:38 -07:00
caif_config_util.c caif: Add debug connection type for CAIF. 2010-06-20 19:46:07 -07:00
caif_dev.c caif: Fix function NULL pointer check. 2010-09-21 18:05:31 -07:00
caif_socket.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-10-06 19:39:31 -07:00
cfcnfg.c caif: Minor fixes in log prints. 2010-09-21 18:05:30 -07:00
cfctrl.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfdbgl.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfdgml.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cffrml.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfmuxl.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfpkt_skbuff.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfrfml.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-09-09 22:27:33 -07:00
cfserl.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfsrvl.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfutill.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfveil.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
cfvidl.c net/caif: Use pr_fmt 2010-09-06 18:48:43 -07:00
chnl_net.c caif: Remove buggy re-definition of pr_debug 2010-09-21 18:05:30 -07:00