summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'config' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/bklLinus Torvalds2011-03-166-100/+59
|\
| * ipx: remove the BKLArnd Bergmann2011-03-052-33/+20
| * appletalk: remove the BKLArnd Bergmann2011-03-051-24/+16
| * x25: remove the BKLArnd Bergmann2011-03-053-43/+23
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-03-16414-12848/+29639
|\ \
| * | xfrm: Refcount destination entry on xfrm_lookupSteffen Klassert2011-03-161-0/+2
| * | net: introduce rx_handler results and logic around thatJiri Pirko2011-03-164-19/+30
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-161-9/+27
| |\ \
| | * | netfilter ebtables: fix xt_AUDIT to work with ebtablesThomas Graf2011-03-161-9/+27
| * | | net_sched: fix ip_tos2prioDan Siemon2011-03-151-1/+1
| * | | xfrm: fix __xfrm_route_forward()Eric Dumazet2011-03-151-2/+2
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-03-154-15/+38
| |\ \ \
| | * | | tcp_cubic: fix low utilization of CUBIC with HyStartSangtae Ha2011-03-141-0/+7
| | * | | tcp_cubic: make the delay threshold of HyStart less sensitiveSangtae Ha2011-03-141-1/+1
| | * | | tcp_cubic: enable high resolution ack time if neededstephen hemminger2011-03-141-0/+4
| | * | | tcp_cubic: fix clock dependencystephen hemminger2011-03-141-12/+19
| | * | | tcp_cubic: make ack train delta value a parameterstephen hemminger2011-03-141-1/+4
| | * | | tcp_cubic: fix comparison of jiffiesstephen hemminger2011-03-141-2/+4
| | * | | tcp: fix RTT for quick packets in congestion controlstephen hemminger2011-03-141-1/+1
| | * | | af_unix: update locking commentDaniel Baluta2011-03-141-1/+1
| | * | | bridge: skip forwarding delay if not using STPstephen hemminger2011-03-141-2/+2
| * | | | Phonet: fix aligned-mode pipe socket buffer header reserveRémi Denis-Courmont2011-03-151-1/+1
| * | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2011-03-157-12/+201
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-03-157-12/+201
| | |\ \ \ \
| | | * | | | mac80211: fix channel type recalculation with HT and non-HT interfacesFelix Fietkau2011-03-141-0/+3
| | | * | | | mac80211: Shortcut minstrel_ht rate setup for non-MRR capable devicesHelmut Schaa2011-03-141-7/+34
| | | * | | | mac80211: implement support for cfg80211_ops->{get,set}_ringparamJohn W. Linville2011-03-113-0/+95
| | | * | | | wireless: add support for ethtool_ops->{get,set}_ringparamJohn W. Linville2011-03-111-0/+33
| | | * | | | mac80211: do not enable ps if 802.1x controlled port is unblockedJason Young2011-03-112-5/+36
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-03-1521-394/+611
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | netfilter: xt_addrtype: ipv6 supportFlorian Westphal2011-03-152-2/+97
| | * | | | netfilter: ipt_addrtype: rename to xt_addrtypeFlorian Westphal2011-03-155-26/+27
| | * | | | 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: 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: 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-151-2/+2
| | * | | | IPVS: Add {sysctl_sync_threshold,period}()Simon Horman2011-03-153-9/+9
| | * | | | 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
OpenPOWER on IntegriCloud