Juuso Oikarinen 195e294d21 mac80211: Determine dynamic PS timeout based on ps-qos network latency ... Determine the dynamic PS timeout based on the configured ps-qos network latency. For backwards wext compatibility, allow the dynamic PS timeout configured by the cfg80211 to overrule the automatically determined value. Signed-off-by: Juuso Oikarinen <juuso.oikarinen@nokia.com> Signed-off-by: John W. Linville <linville@tuxdriver.com>		2010-04-27 16:09:22 -04:00
..
acpi	Merge branch 'acpica' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6	2010-03-01 10:36:22 -08:00
asm-generic	fix up O_SYNC comments	2009-12-17 11:03:24 -05:00
crypto	crypto: md5 - Add export support	2010-01-17 21:55:31 +11:00
drm	Merge remote branch 'nouveau/for-airlied' of nouveau-2.6	2010-02-11 12:10:52 +10:00
keys
linux	cfg80211: add ap isolation support	2010-04-27 16:09:21 -04:00
math-emu
media	V4L/DVB: tuner-types: Add Sony BTF-Pxn01Z tuner type used on GigaPocket cards	2010-02-26 15:11:07 -03:00
mtd
net	mac80211: Determine dynamic PS timeout based on ps-qos network latency	2010-04-27 16:09:22 -04:00
pcmcia	Merge branch 'master' of /home/davem/src/GIT/linux-2.6/	2010-02-28 19:23:06 -08:00
rdma	Merge branches 'amso1100', 'cma', 'cxgb3', 'ehca', 'ipath', 'ipoib', 'iser', 'misc', 'mlx4' and 'nes' into for-next	2009-12-15 23:39:25 -08:00
rxrpc
scsi	[SCSI] scsi_transport_sas: add support for transport layer retries (TLR)	2010-02-08 17:15:19 -06:00
sound	Merge branch 'topic/asoc' into for-linus	2010-03-01 12:38:59 +01:00
trace	Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip	2010-02-28 10:20:25 -08:00
video	video: sh_mobile_lcdcfb: Add wait for vsync.	2010-02-16 13:30:27 +09:00
xen	xen: move Xen-testing predicates to common header	2009-11-04 08:47:24 -08:00
Kbuild