David S. Miller 263fb5b1bf Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/e1000e/netdev.c

2011-02-08 17:19:01 -08:00

..

caif_config_util.c

caif: Bugfix for socket priority, bindtodev and dbg channel.

2010-11-03 18:50:03 -07:00

caif_dev.c

caif: Bugfix for socket priority, bindtodev and dbg channel.

2010-11-03 18:50:03 -07:00

caif_socket.c

caif: don't set connection request param size before copying data

2011-01-10 16:00:54 -08:00

cfcnfg.c

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

cfctrl.c

caif: Remove noisy printout when disconnecting caif socket

2010-11-03 18:50:04 -07:00

cfdbgl.c

caif: Bugfix for socket priority, bindtodev and dbg channel.

2010-11-03 18:50:03 -07:00

cfdgml.c

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08: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

caif: Bugfix for socket priority, bindtodev and dbg channel.

2010-11-03 18:50:03 -07:00

cfserl.c

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

cfsrvl.c

net/caif: Use pr_fmt

2010-09-06 18:48:43 -07:00

cfutill.c

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

cfveil.c

net: cleanup unused macros in net directory

2011-01-19 23:20:04 -08:00

cfvidl.c

net/caif: Use pr_fmt

2010-09-06 18:48:43 -07:00

chnl_net.c

net/caif: Fix dangling list pointer in freed object on error.

2011-02-08 14:31:31 -08:00

Kconfig

caif: Kconfig and Makefile fixes

2010-06-29 00:06:38 -07:00

Makefile

Net: caif: Makefile: Remove deprecated items

2010-11-22 08:16:09 -08:00