aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Revert "block: fix accounting bug on cross partition merges"Jens Axboe2010-10-243-4/+0
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-23106-861/+2166
|\
| * vlan: Calling vlan_hwaccel_do_receive() is always valid.Jesse Gross2010-10-211-1/+2
| * Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-10-217-47/+39
| |\
| | * Revert c6537d6742985da1fbf12ae26cde6a096fd35b5cNeil Horman2010-10-211-12/+18
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-10-2120-215/+573
| |\ \
| | * \ Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h...Patrick McHardy2010-10-211-12/+41
| | |\ \
| | | * | ipvs: provide address family for debuggingJulian Anastasov2010-10-211-8/+9
| | | * | ipvs: changes for local real serverJulian Anastasov2010-10-211-0/+1
| | | * | ipvs: do not schedule conns from real serversJulian Anastasov2010-10-211-1/+2
| | | * | ipvs: switch to notrack modeJulian Anastasov2010-10-211-1/+19
| | | * | ipvs: optimize checksums for appsJulian Anastasov2010-10-211-2/+10
| | * | | tproxy: added IPv6 support to the TPROXY targetBalazs Scheidler2010-10-211-3/+10
| | * | | tproxy: added IPv6 socket lookup function to nf_tproxy_coreBalazs Scheidler2010-10-211-1/+71
| | * | | tproxy: added tproxy sockopt interface in the IPV6 layerBalazs Scheidler2010-10-212-1/+7
| | * | | tproxy: added udp6_lib_lookup functionBalazs Scheidler2010-10-211-0/+3
| | * | | tproxy: split off ipv6 defragmentation to a separate moduleBalazs Scheidler2010-10-211-0/+6
| | * | | tproxy: fix hash locking issue when using port redirection in __inet_inherit_...Balazs Scheidler2010-10-211-1/+1
| | * | | tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()Balazs Scheidler2010-10-211-2/+114
| | * | | tproxy: kick out TIME_WAIT sockets in case a new connection comes in with the...Balazs Scheidler2010-10-211-1/+5
| | |/ /
| | * | ipvs: IPv6 tunnel modeHans Schillstrom2010-10-191-0/+4
| | * | netfilter: ctnetlink: add expectation deletion eventsPablo Neira Ayuso2010-10-192-1/+8
| | * | netfilter: install missing ebtables headers for userspaceNick Bowler2010-10-181-0/+2
| | * | netfilter: xtables: remove unused definesJan Engelhardt2010-10-133-12/+0
| | * | netfilter: xtables: unify {ip,ip6,arp}t_error_targetJan Engelhardt2010-10-134-21/+14
| | * | netfilter: xtables: resolve indirect macros 3/3Jan Engelhardt2010-10-133-104/+67
| | * | netfilter: xtables: resolve indirect macros 2/3Jan Engelhardt2010-10-133-29/+24
| | * | netfilter: xtables: resolve indirect macros 1/3Jan Engelhardt2010-10-133-13/+18
| | * | netfilter: add missing xt_log.h filePatrick McHardy2010-10-041-0/+54
| | * | netfilter: nf_nat: make find/put staticStephen Hemminger2010-10-041-3/+0
| | * | IPVS: Allow configuration of persistence enginesSimon Horman2010-10-042-0/+4
| | * | IPVS: management of persistence engine modulesSimon Horman2010-10-041-0/+6
| | * | IPVS: Add persistence engine data to /proc/net/ip_vs_connSimon Horman2010-10-041-0/+1
| | * | IPVS: Add struct ip_vs_peSimon Horman2010-10-042-1/+29
| | * | IPVS: Add struct ip_vs_conn_paramSimon Horman2010-10-041-14/+30
| | * | netfilter: nf_conntrack_sip: Add callid parserSimon Horman2010-10-041-0/+1
| | * | netfilter: ctnetlink: add support for user-space expectation helpersPablo Neira Ayuso2010-09-282-0/+2
| | * | netfilter: ctnetlink: allow to specify the expectation flagsPablo Neira Ayuso2010-09-223-3/+5
| | * | ipvs: make rerouting optional with snat_rerouteJulian Anastasov2010-09-211-0/+1
| | * | ipvs: netfilter connection tracking changesJulian Anastasov2010-09-212-1/+45
| | * | ipvs: extend connection flags to 32 bitsJulian Anastasov2010-09-172-1/+9
| * | | 9p: client code cleanupstephen hemminger2010-10-211-3/+0
| * | | napi: unexport napi_reuse_skbstephen hemminger2010-10-211-2/+0
| * | | net_sched: remove the unused parameter of qdisc_create_dflt()Changli Gao2010-10-211-2/+1
| * | | xfrm: make xfrm_bundle_ok localstephen hemminger2010-10-211-2/+0
| * | | rtnetlink: remove rtnl_kill_linksstephen hemminger2010-10-211-1/+0
| * | | xfrm6: make xfrm6_tunnel_free_spi localstephen hemminger2010-10-211-1/+0
| * | | socket: localize functionsstephen hemminger2010-10-211-1/+0
| * | | ethtool: Add support for vlan accleration.Jesse Gross2010-10-211-0/+2
| * | | vlan: Centralize handling of hardware acceleration.Jesse Gross2010-10-212-3/+4