Johannes Berg 2973773775 mac80211: remove IBSS merge delay ... This reverts 4a332a38 ("mac80211: Give it some time to do the TSF sync"). There's no point in waiting with a new IBSS merge just because the hardware hasn't merged up with the old IBSS yet, and since 34e8f082 we no longer attempt to merge with the IBSS we're already in. Signed-off-by: Johannes Berg <johannes.berg@intel.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2011-02-25 15:32:34 -05:00
..
9p
802
8021q
appletalk
atm
ax25	net: ax25: fix information leak to userland harder	2011-01-12 00:34:49 -08:00
batman-adv
bluetooth	Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6	2011-02-18 17:03:41 -05:00
bridge
caif
can
ceph	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client	2011-01-13 10:25:24 -08:00
core	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-14 13:25:30 -08:00
dcb
dccp	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
decnet	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
dns_resolver
dsa
econet
ethernet	eth: fix new kernel-doc warning	2011-01-12 19:00:40 -08:00
ieee802154
ipv4	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
ipv6	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-14 13:25:30 -08:00
ipx
irda
iucv
key
l2tp
lapb
llc
mac80211	mac80211: remove IBSS merge delay	2011-02-25 15:32:34 -05:00
netfilter	netfilter: ctnetlink: fix loop in ctnetlink_get_conntrack()	2011-01-13 17:03:39 +01:00
netlabel
netlink
netrom
packet
phonet
rds
rfkill
rose
rxrpc	rxrpc: rxrpc_workqueue isn't used during memory reclaim	2011-01-14 09:25:11 -08:00
sched	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6	2011-01-14 13:25:30 -08:00
sctp
sunrpc	Merge branch 'for-2.6.38' of git://linux-nfs.org/~bfields/linux	2011-01-14 13:17:26 -08:00
tipc
unix
wanrouter
wimax
wireless	cfg80211: Fix power save state after interface type change	2011-02-03 16:44:42 -05:00
x25
xfrm
compat.c
Kconfig	Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	2011-01-13 10:05:56 -08:00
Makefile
nonet.c
socket.c	pass default dentry_operations to mount_pseudo()	2011-01-12 20:03:43 -05:00
sysctl_net.c
TUNABLE