aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Revert "block: fix accounting bug on cross partition merges"Jens Axboe2010-10-248-47/+13
* Merge branch 'for-2.6.37/core' of git://git.kernel.dk/linux-2.6-blockLinus Torvalds2010-10-232-2/+2
|\
| * block: fix use-after-free bug in blk throttle codeJens Axboe2010-10-232-2/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-10-231341-83259/+156508
|\ \
| * | bnx2/bnx2x: Unsupported Ethtool operations should return -EINVAL.Jesse Gross2010-10-212-2/+2
| * | 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-21192-757/+1302
| |\ \
| | * | Revert d88dca79d3852a3623f606f781e013d61486828aNeil Horman2010-10-212-22/+37
| | * | Revert c6537d6742985da1fbf12ae26cde6a096fd35b5cNeil Horman2010-10-212-22/+23
| | * | net/core: Allow tagged VLAN packets to flow through VETH devices.Ben Greear2010-10-211-1/+1
| | * | Merge branch 'vhost-net' of git://git.kernel.org/pub/scm/linux/kernel/git/mst...David S. Miller2010-10-211-1/+1
| | |\ \
| | | * | vhost: fix return code for log_access_ok()Dan Carpenter2010-10-121-1/+1
| | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...David S. Miller2010-10-211-2/+2
| | |\ \ \
| | | * | | Bluetooth: fix oops in l2cap_connect_reqNathan Holstein2010-10-171-2/+2
| | * | | | Merge branch 'master' of /home/davem/src/GIT/linux-2.6/David S. Miller2010-10-21178-680/+1184
| | |\ \ \ \
| | * | | | | r6040: Fix multicast filter some moreBen Hutchings2010-10-191-10/+12
| | * | | | | gianfar: fix double lock typoDan Carpenter2010-10-181-1/+1
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-10-2178-1929/+4226
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'for-patrick' of git://git.kernel.org/pub/scm/linux/kernel/git/h...Patrick McHardy2010-10-2112-410/+959
| | |\ \ \ \ \ \
| | | * | | | | | nf_nat: restrict ICMP translation for embedded headerJulian Anastasov2010-10-211-14/+15
| | | * | | | | | ipvs: provide address family for debuggingJulian Anastasov2010-10-218-92/+54
| | | * | | | | | ipvs: inherit forwarding method in backupJulian Anastasov2010-10-211-0/+2
| | | * | | | | | ipvs: changes for local clientJulian Anastasov2010-10-212-92/+225
| | | * | | | | | ipvs: changes for local real serverJulian Anastasov2010-10-214-117/+458
| | | * | | | | | ipvs: move ip_route_me_harder for ICMPJulian Anastasov2010-10-211-20/+21
| | | * | | | | | ipvs: create ip_vs_defrag_userJulian Anastasov2010-10-211-21/+34
| | | * | | | | | ipvs: fix CHECKSUM_PARTIAL for TUN methodJulian Anastasov2010-10-211-1/+1
| | | * | | | | | ipvs: stop ICMP from FORWARD to localJulian Anastasov2010-10-211-2/+19
| | | * | | | | | ipvs: do not schedule conns from real serversJulian Anastasov2010-10-215-9/+47
| | | * | | | | | ipvs: switch to notrack modeJulian Anastasov2010-10-213-38/+28
| | | * | | | | | ipvs: optimize checksums for appsJulian Anastasov2010-10-214-15/+66
| | | * | | | | | ipvs: fix CHECKSUM_PARTIAL for TCP, UDPJulian Anastasov2010-10-212-10/+10
| | * | | | | | | tproxy: use the interface primary IP address as a default value for --on-ipBalazs Scheidler2010-10-211-70/+132
| | * | | | | | | tproxy: added IPv6 support to the socket matchBalazs Scheidler2010-10-211-11/+154
| | * | | | | | | tproxy: added IPv6 support to the TPROXY targetBalazs Scheidler2010-10-212-40/+235
| | * | | | | | | tproxy: added IPv6 socket lookup function to nf_tproxy_coreBalazs Scheidler2010-10-211-1/+71
| | * | | | | | | tproxy: allow non-local binds of IPv6 sockets if IP_TRANSPARENT is enabledBalazs Scheidler2010-10-211-1/+2
| | * | | | | | | tproxy: added tproxy sockopt interface in the IPV6 layerBalazs Scheidler2010-10-214-1/+49
| | * | | | | | | tproxy: added udp6_lib_lookup functionBalazs Scheidler2010-10-212-0/+11
| | * | | | | | | tproxy: added const specifiers to udp lookup functionsBalazs Scheidler2010-10-211-4/+4
| | * | | | | | | tproxy: split off ipv6 defragmentation to a separate moduleBalazs Scheidler2010-10-215-78/+156
| | * | | | | | | tproxy: fix hash locking issue when using port redirection in __inet_inherit_...Balazs Scheidler2010-10-216-16/+56
| | * | | | | | | tproxy: add lookup type checks for UDP in nf_tproxy_get_sock_v4()Balazs Scheidler2010-10-212-50/+114
| | * | | | | | | tproxy: kick out TIME_WAIT sockets in case a new connection comes in with the...Balazs Scheidler2010-10-214-15/+90
| | |/ / / / / /
| | * | | | | | Fixed race condition at ip_vs.ko module init.Eduardo Blanco2010-10-191-9/+10
| | * | | | | | ipvs: IPv6 tunnel modeHans Schillstrom2010-10-192-79/+96
| | * | | | | | netfilter: ctnetlink: add expectation deletion eventsPablo Neira Ayuso2010-10-194-12/+33
| | * | | | | | netfilter: install missing ebtables headers for userspaceNick Bowler2010-10-181-0/+2
| | * | | | | | netfilter: fix kconfig unmet dependency warningRandy Dunlap2010-10-182-4/+4
| | * | | | | | IPVS: ip_vs_dbg_callid() is only needed for debuggingSimon Horman2010-10-131-0/+2