Linus Torvalds 06f4e926d2 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: (1446 commits) macvlan: fix panic if lowerdev in a bond tg3: Add braces around 5906 workaround. tg3: Fix NETIF_F_LOOPBACK error macvlan: remove one synchronize_rcu() call networking: NET_CLS_ROUTE4 depends on INET irda: Fix error propagation in ircomm_lmp_connect_response() irda: Kill set but unused variable 'bytes' in irlan_check_command_param() irda: Kill set but unused variable 'clen' in ircomm_connect_indication() rxrpc: Fix set but unused variable 'usage' in rxrpc_get_transport() be2net: Kill set but unused variable 'req' in lancer_fw_download() irda: Kill set but unused vars 'saddr' and 'daddr' in irlan_provider_connect_indication() atl1c: atl1c_resume() is only used when CONFIG_PM_SLEEP is defined. rxrpc: Fix set but unused variable 'usage' in rxrpc_get_peer(). rxrpc: Kill set but unused variable 'local' in rxrpc_UDP_error_handler() rxrpc: Kill set but unused variable 'sp' in rxrpc_process_connection() rxrpc: Kill set but unused variable 'sp' in rxrpc_rotate_tx_window() pkt_sched: Kill set but unused variable 'protocol' in tc_classify() isdn: capi: Use pr_debug() instead of ifdefs. tg3: Update version to 3.119 tg3: Apply rx_discards fix to 5719/5720 ... Fix up trivial conflicts in arch/x86/Kconfig and net/mac80211/agg-tx.c as per Davem.		2011-05-20 13:43:21 -07: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
client.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07: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
mod.c	9p: consolidate transport structure	2008-10-17 11:04:41 -05:00
protocol.c	net/9p/protocol.c: Fix a memory leak	2011-05-12 17:05:37 -05:00
protocol.h	9P2010.L handshake: Remove "dotu" variable	2010-03-05 15:04:42 -06:00
trans_common.c	net/9p: Handle get_user_pages_fast return properly	2011-05-09 22:51:12 -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	9p: Kill set but not used variable 'ret' in parse_opts()	2011-05-19 17:38:57 -04:00
trans_rdma.c	9p: Kill unused variable 'ret' in trans_rdma.c:parse_opts()	2011-05-19 17:45:29 -04:00
trans_virtio.c	9p: Fix sparse error	2011-04-15 15:26:14 -05:00
util.c	Fix common misspellings	2011-03-31 11:26:23 -03:00