summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-03-1531-244/+596
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-1531-244/+596
| |\
| | * ath9k: fix aggregation related interoperability issuesFelix Fietkau2011-03-141-1/+1
| | * mac80211: fix channel type recalculation with HT and non-HT interfacesFelix Fietkau2011-03-141-0/+3
| | * ath9k: improve reliability of beacon transmission and stuck beacon handlingFelix Fietkau2011-03-143-74/+12
| | * ath9k: fix the .flush driver op implementationFelix Fietkau2011-03-143-51/+34
| | * ath9k: fix stopping tx dma on resetFelix Fietkau2011-03-143-8/+35
| | * ath9k_hw: fix REG_SET_BIT and REG_CLR_BIT for multiple bitsFelix Fietkau2011-03-141-2/+2
| | * mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devicesHelmut Schaa2011-03-141-7/+34
| | * ath5k: implement ieee80211_ops->{get,set}_ringparamJohn W. Linville2011-03-113-1/+46
| | * mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville2011-03-114-0/+102
| | * wireless: add support for ethtool_ops->{get,set}_ringparamJohn W. Linville2011-03-112-0/+41
| | * iwlagn: support off-channel TXJohannes Berg2011-03-116-51/+238
| | * mac80211: do not enable ps if 802.1x controlled port is unblockedJason Young2011-03-112-5/+36
| | * libertas: fix write past end of array in mesh_id_get()Dan Carpenter2011-03-111-7/+4
| | * ath9k_hw: Increase the wait count for nf load.Vivek Natarajan2011-03-111-2/+2
| | * ath9k_hw: Fix PLL initialization for AR9485.Vivek Natarajan2011-03-111-2/+2
| | * ath9k_hw: Improve idle power consumption for AR9485.Vivek Natarajan2011-03-111-0/+2
| | * ath9k: remove support for the FIF_PROMISC_IN_BSS filter flagFelix Fietkau2011-03-111-3/+1
| | * wl1251: fix elp_work race conditionGrazvydas Ignotas2011-03-111-1/+3
| | * wl1251: remove wl1251_ps_set_elp functionGrazvydas Ignotas2011-03-111-34/+3
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-1527-557/+845
|\ \ \ | |/ / |/| |
| * | netfilter: xt_addrtype: ipv6 supportFlorian Westphal2011-03-153-2/+114
| * | netfilter: ipt_addrtype: rename to xt_addrtypeFlorian Westphal2011-03-158-26/+63
| * | ipv6: netfilter: ip6_tables: fix infoleak to userspaceVasiliy Kulikov2011-03-151-0/+3
| * | netfilter: ip_tables: fix infoleak to userspaceVasiliy Kulikov2011-03-151-0/+3
| * | netfilter: arp_tables: fix infoleak to userspaceVasiliy Kulikov2011-03-151-0/+3
| * | netfilter: xt_connlimit: remove connlimit_rnd_initedChangli Gao2011-03-151-4/+7
| * | netfilter: xt_connlimit: use hlist insteadChangli Gao2011-03-151-14/+14
| * | netfilter: xt_connlimit: use kmalloc() instead of kzalloc()Changli Gao2011-03-151-1/+1
| * | netfilter: xt_connlimit: fix daddr connlimit in SNAT scenarioChangli Gao2011-03-151-11/+9
| * | IPVS: Conditionally include sysctl members of struct netns_ipvsSimon Horman2011-03-151-8/+13
| * | IPVS: Add __ip_vs_control_{init,cleanup}_sysctl()Simon Horman2011-03-151-36/+62
| * | IPVS: Conditionally define and use ip_vs_lblc{r}_tableSimon Horman2011-03-152-9/+20
| * | IPVS: Minimise ip_vs_leave when CONFIG_SYSCTL is undefinedSimon Horman2011-03-151-2/+7
| * | IPVS: Conditional ip_vs_conntrack_enabled()Simon Horman2011-03-151-0/+4
| * | IPVS: ip_vs_todrop() becomes a noop when CONFIG_SYSCTL is undefinedSimon Horman2011-03-151-0/+4
| * | IPVS: Conditinally use sysctl_lblc{r}_expirationSimon Horman2011-03-152-9/+28
| * | IPVS: Add expire_quiescent_template()Simon Horman2011-03-151-2/+11
| * | IPVS: Add sysctl_expire_nodest_conn()Simon Horman2011-03-151-1/+7
| * | IPVS: Add sysctl_sync_ver()Simon Horman2011-03-152-2/+13
| * | IPVS: Add {sysctl_sync_threshold,period}()Simon Horman2011-03-154-9/+38
| * | IPVS: Add sysctl_nat_icmp_send()Simon Horman2011-03-151-3/+8
| * | IPVS: Add sysctl_snat_reroute()Simon Horman2011-03-151-4/+16
| * | IPVS: Add ip_vs_route_me_harder()Simon Horman2011-03-151-26/+22
| * | ipvs: rename estimator functionsJulian Anastasov2011-03-153-10/+10
| * | ipvs: optimize rates readingJulian Anastasov2011-03-153-39/+27
| * | ipvs: remove unused seqcount statsJulian Anastasov2011-03-151-17/+0
| * | ipvs: properly zero stats and ratesJulian Anastasov2011-03-153-43/+69
| * | ipvs: reorganize tot_statsJulian Anastasov2011-03-154-28/+29
OpenPOWER on IntegriCloud