Linus Torvalds 1beee8dc8c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6: (26 commits) llc: Fix double accounting of received packets netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init() bluetooth: fix locking bug in the rfcomm socket cleanup handling mac80211: fix alignment issue with compare_ether_addr() mac80211: Fix for NULL pointer dereference in sta_info_get() mac80211: fix a typo in ieee80211_handle_filtered_frame comment rndis_wlan: add missing range check for power_output modparam iwlwifi: fix rate scale TLC column selection bug iwlwifi: fix exit from stay_in_table state rndis_wlan: Make connections to TKIP PSK networks work mac80211 : Fixes the status message for iwconfig rt2x00: Use atomic interface iteration in irq context rt2x00: Reset antenna RSSI after switch rt2x00: Don't count retries as failure rt2x00: Fix memleak in tx() path mac80211: reorder channel and freq reporting in wext scan report b43: Fix controller restart crash mac80211: fix ieee80211_rx_bss_put/get imbalance net/mac80211: always true conditionals b43: Upload both beacon templates on initial load ...		2008-05-30 07:45:20 -07:00
..
9p	9p: fix error path during early mount	2008-05-14 19:23:27 -05:00
802	[TR] net/802/tr.c: sysctl_tr_rif_timeout static	2008-01-31 19:28:31 -08:00
8021q	vlan: Use bitmask of feature flags instead of seperate feature bits	2008-05-23 00:27:50 -07:00
appletalk	[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.	2008-03-26 04:39:53 +09:00
atm	Revert "atm: Do not free already unregistered net device."	2008-05-06 00:00:16 -07:00
ax25	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
bluetooth	bluetooth: fix locking bug in the rfcomm socket cleanup handling	2008-05-29 01:32:47 -07:00
bridge	bridge: Consolidate error paths in br_add_bridge().	2008-05-04 17:58:07 -07:00
can	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-08 19:03:26 -07:00
core	pktgen: make sure that pktgen_thread_worker has been executed	2008-05-20 15:12:44 -07:00
dccp	dccp ccid-3: Fix "t_ipi explosion" bug	2008-05-27 06:33:54 -07:00
decnet	ip: Use inline function dst_metric() instead of direct access to dst->metric[]	2008-05-04 22:14:42 -07:00
econet	net: Allow netdevices to specify needed head/tailroom	2008-05-12 20:48:31 -07:00
ethernet	[NET]: Return more appropriate error from eth_validate_addr().	2008-04-13 22:45:40 -07:00
ieee80211	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
ipv4	net: The world is not perfect patch.	2008-05-21 17:47:54 -07:00
ipv6	net: The world is not perfect patch.	2008-05-21 17:47:54 -07:00
ipx	[NET] NETNS: Omit net_device->nd_net without CONFIG_NET_NS.	2008-03-26 04:39:53 +09:00
irda	net/irda/irnet/irnet_irda.c needs unaligned.h	2008-05-14 19:11:15 -07:00
iucv	iucv: Delay bus registration until core is ready.	2008-04-10 02:12:45 -07:00
key	af_key: Fix selector family initialization.	2008-05-21 13:26:11 -07:00
lapb	[LAPB] net/lapb/lapb_iface.c: use LIST_HEAD instead of LIST_HEAD_INIT	2008-01-28 14:56:52 -08:00
llc	llc: Fix double accounting of received packets	2008-05-30 02:57:29 -07:00
mac80211	mac80211: fix alignment issue with compare_ether_addr()	2008-05-28 16:43:50 -04:00
netfilter	netfilter: nf_conntrack_expect: fix error path unwind in nf_conntrack_expect_init()	2008-05-29 03:19:37 -07:00
netlabel	Audit: collect sessionid in netlink messages	2008-04-28 06:18:03 -04:00
netlink	Audit: collect sessionid in netlink messages	2008-04-28 06:18:03 -04:00
netrom	[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.	2008-03-26 04:39:55 +09:00
packet	net: Allow netdevices to specify needed head/tailroom	2008-05-12 20:48:31 -07:00
rfkill	rfkill: Fix device type check when toggling states	2008-04-15 15:04:35 -04:00
rose	rose: Wrong list_lock argument in rose_node seqops	2008-05-02 17:03:22 -07:00
rxrpc	net: Add missing braces to multi-statement if()s	2008-05-02 16:20:10 -07:00
sched	net_sched: cls_api: fix return value for non-existant classifiers	2008-05-20 14:34:46 -07:00
sctp	sctp: Fix use of uninitialized pointer	2008-05-13 23:25:00 -07:00
sunrpc	Merge branch 'for-2.6.26' of git://linux-nfs.org/~bfields/linux	2008-05-20 19:30:54 -07:00
tipc	tipc: Increase buffer header to support worst-case device	2008-05-08 21:38:24 -07:00
unix	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-24 08:40:34 -07:00
wanrouter	[WANROUTER]: Use proc_create() to setup ->proc_fops first	2008-02-28 14:15:56 -08:00
wireless	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-04-14 02:30:23 -07:00
x25	[NET] NETNS: Omit sock->sk_net without CONFIG_NET_NS.	2008-03-26 04:39:55 +09:00
xfrm	xfrm_user: Remove zero length key checks.	2008-05-21 17:36:21 -07:00
compat.c	net: Add compat support for getsockopt (MCAST_MSFILTER)	2008-04-29 03:23:22 -07:00
Kconfig	[IPV4]: Fix size description of CONFIG_INET.	2008-03-04 15:18:22 +09:00
Makefile	[CAN]: Add PF_CAN core module	2008-01-28 14:54:10 -08:00
nonet.c
socket.c	net: Unexport move_addr_to_{kernel,user}	2008-04-23 03:37:49 -07:00
sysctl_net.c	net: fix returning void-valued expression warnings	2008-05-01 02:47:38 -07:00
TUNABLE