Linus Torvalds 7a6362800c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1480 commits) bonding: enable netpoll without checking link status xfrm: Refcount destination entry on xfrm_lookup net: introduce rx_handler results and logic around that bonding: get rid of IFF_SLAVE_INACTIVE netdev->priv_flag bonding: wrap slave state work net: get rid of multiple bond-related netdevice->priv_flags bonding: register slave pointer for rx_handler be2net: Bump up the version number be2net: Copyright notice change. Update to Emulex instead of ServerEngines e1000e: fix kconfig for crc32 dependency netfilter ebtables: fix xt_AUDIT to work with ebtables xen network backend driver bonding: Improve syslog message at device creation time bonding: Call netif_carrier_off after register_netdevice bonding: Incorrect TX queue offset net_sched: fix ip_tos2prio xfrm: fix __xfrm_route_forward() be2net: Fix UDP packet detected status in RX compl Phonet: fix aligned-mode pipe socket buffer header reserve netxen: support for GbE port settings ... Fix up conflicts in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c with the staging updates.		2011-03-16 16:29:25 -07:00
..
client.c	net/9p: Implement syncfs 9P operation	2011-03-15 09:57:38 -05:00
error.c	net/9p: insulate the client against an invalid error code sent by a 9p server	2009-08-17 16:39:54 -05:00
Kconfig	9p: disallow RDMA if RDMA CM isn't available	2009-01-15 16:39:42 -08:00
Makefile	[net/9p] Preparation and helper functions for zero copy	2011-03-15 09:57:34 -05:00
mod.c	9p: consolidate transport structure	2008-10-17 11:04:41 -05:00
protocol.c	[net/9p] readdir zerocopy changes for 9P2000.L protocol.	2011-03-15 09:57:35 -05:00
protocol.h	9P2010.L handshake: Remove "dotu" variable	2010-03-05 15:04:42 -06:00
trans_common.c	[net/9p] Preparation and helper functions for zero copy	2011-03-15 09:57:34 -05:00
trans_common.h	[net/9p] Add gup/zero_copy support to VirtIO transport layer.	2011-03-15 09:57:35 -05:00
trans_fd.c	net/9p: replace p9_poll_task with a work	2011-02-01 11:42:43 +01:00
trans_rdma.c	net: cleanup unused macros in net directory	2011-01-19 23:20:04 -08:00
trans_virtio.c	[net/9p] Add preferences to transport layer.	2011-03-15 09:57:35 -05:00
util.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00