Linus Torvalds c63a119036 Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 ... * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (23 commits) iwlwifi: fix rf_kill state inconsistent during suspend and resume b43: Fix rfkill radio LED bcm43xx_debugfs sscanf fix libertas: select WIRELESS_EXT iwlwifi3945/4965: fix rate control algo reference leak ieee80211_rate: missed unlock wireless/ipw2200.c: add __dev{init,exit} annotations zd1211rw: Fix alignment problems libertas: add Dan Williams as maintainer sis190 endianness ucc_geth: really fix section mismatch pcnet_cs: add new id ixgb: make sure jumbos stay enabled after reset Net: ibm_newemac, remove SPIN_LOCK_UNLOCKED net: smc911x: shut up compiler warnings ucc_geth: minor whitespace fix drivers/net/s2io.c section fixes drivers/net/sis190.c section fix hamachi endianness fixes e100: free IRQ to remove warningwhenrebooting ...		2007-12-17 19:29:41 -08:00
..
9p	9p: add missing end-of-options record for trans_fd	2007-11-06 08:02:53 -06:00
802	[NET]: Move hardware header operations out of netdevice.	2007-10-10 16:52:52 -07:00
8021q	[VLAN]: Fix potential race in vlan_cleanup_module vs vlan_ioctl_handler.	2007-12-11 02:45:32 -08:00
appletalk	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
atm	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
ax25	[AX25]: Locking dependencies fix in ax25_disconnect().	2007-12-16 14:02:07 -08:00
bluetooth	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
bridge	[BRIDGE]: Assign random address.	2007-12-16 13:35:51 -08:00
core	[NET]: Fix wrong comments for unregister_net*	2007-12-11 02:45:32 -08:00
dccp	[DCCP]: Add missing "space"	2007-11-19 23:46:02 -08:00
decnet	[DECNET]: dn_nl_deladdr() almost always returns no error	2007-11-30 23:43:31 +11:00
econet	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
ethernet	[NET]: Validate device addr prior to interface-up	2007-10-23 21:27:50 -07:00
ieee80211	Merge branch 'fixes-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2007-11-30 23:29:27 +11:00
ipv4	[IPV4]: Make tcp_input_metrics() get minimum RTO via tcp_rto_min()	2007-12-16 14:00:19 -08:00
ipv6	[IPV6]: Fix the return value of ipv6_getsockopt	2007-12-16 13:39:57 -08:00
ipx	[IPX]: Use existing sock refcnt debugging infrastructure	2007-11-10 21:39:26 -08:00
irda	[IRDA]: irda parameters warning fixes.	2007-12-16 14:10:33 -08:00
iucv	[S390] Explicitly code allocpercpu calls in iucv	2007-11-20 11:13:47 +01:00
key	[IPSEC]: Temporarily remove locks around copying of non-atomic fields	2007-11-26 19:07:34 +08:00
lapb	[PATCH] remove many unneeded #includes of sched.h	2007-02-14 08:09:54 -08:00
llc	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
mac80211	ieee80211_rate: missed unlock	2007-12-17 17:01:39 -05:00
netfilter	[NETFILTER]: xt_hashlimit should use time_after_eq()	2007-12-14 13:54:36 -08:00
netlabel	[NetLabel]: correct usage of RCU locking	2007-10-26 04:29:08 -07:00
netlink	[NET]: Move unneeded data to initdata section.	2007-11-13 03:23:50 -08:00
netrom	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
packet	[AF_PACKET]: Fix minor code duplication	2007-11-12 21:05:20 -08:00
rfkill	rfkill: fix double-mutex-locking	2007-11-29 18:08:48 -05:00
rose	[ROSE]: Trivial compilation CONFIG_INET=n case	2007-12-05 05:37:28 -08:00
rxrpc	[AF_RXRPC]: Add a missing goto	2007-12-07 04:31:47 -08:00
sched	[PKT_SCHED]: Check subqueue status before calling hard_start_xmit	2007-11-13 20:40:55 -08:00
sctp	[SCTP]: Flush fragment queue when exiting partial delivery.	2007-12-16 14:05:45 -08:00
sunrpc	SUNRPC xprtrdma: fix XDR tail buf marshalling for all ops	2007-12-11 22:01:59 -05:00
tipc	[TIPC]: Fix semaphore handling.	2007-12-14 13:54:37 -08:00
unix	[UNIX]: EOF on non-blocking SOCK_SEQPACKET	2007-11-29 23:19:23 +11:00
wanrouter	[NET]: Make /proc/net per network namespace	2007-10-10 16:49:06 -07:00
wireless	[WIRELESS] WEXT: Fix userspace corruption on 64-bit.	2007-11-20 03:29:53 -08:00
x25	[NET]: Forget the zero_it argument of sk_alloc()	2007-11-01 00:39:31 -07:00
xfrm	[XFRM]: Display the audited SPI value in host byte order.	2007-12-14 13:54:35 -08:00
Kconfig	[NET]: Add network namespace clone & unshare support.	2007-10-10 16:52:46 -07:00
Makefile	9p: Reorganization of 9p file system code	2007-07-14 15:13:40 -05:00
TUNABLE	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
compat.c	O_CLOEXEC for SCM_RIGHTS	2007-07-16 09:05:45 -07:00
nonet.c	[PATCH] Make most file operations structs in fs/ const	2006-03-28 09:16:06 -08:00
socket.c	[NET]: Add the helper kernel_sock_shutdown()	2007-11-12 18:10:39 -08:00
sysctl_net.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00