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
..
af_phonet.c	Phonet: return an error when packet TX fails	2011-03-09 11:59:30 -08:00
datagram.c	Phonet: hook resource routing to userspace via ioctl()'s	2010-09-15 21:31:32 -07:00
Kconfig	Phonet: kill the ST-Ericsson pipe controller Kconfig	2011-03-09 11:59:33 -08:00
Makefile	Net: phonet: Makefile: Remove deprecated kbuild goal definitions	2010-11-22 08:16:14 -08:00
pep-gprs.c	Phonet: zero-copy aligned GPRS RX	2010-01-07 00:24:54 -08:00
pep.c	Phonet: fix aligned-mode pipe socket buffer header reserve	2011-03-15 14:55:49 -07:00
pn_dev.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6	2011-05-20 13:43:21 -07:00
pn_netlink.c	net: dont hold rtnl mutex during netlink dump callbacks	2011-05-02 15:26:28 -07:00
socket.c	Phonet: convert bound sockets hash list to RCU	2011-04-14 21:32:53 -07:00
sysctl.c	sysctl net: Remove unused binary sysctl code	2009-11-12 02:05:06 -08:00