summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-1121-118/+181
|\
| * ipv4: Fix "Set rt->rt_iif more sanely on output routes."OGAWA Hirofumi2011-04-072-2/+7
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-04-061-1/+1
| |\
| | * mac80211: Fix duplicate frames on cooked monitorHelmut Schaa2011-04-041-1/+1
| * | dsa/mv88e6131: add support for mv88e6085 switchPeter Korsgaard2011-04-062-4/+21
| * | ipv6: Enable RFS sk_rxhash tracking for ipv6 sockets (v2)Neil Horman2011-04-062-1/+6
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2011-04-0514-110/+146
| |\ \
| | * | netfilter: xt_conntrack: fix inverted conntrack direction testFlorian Westphal2011-04-041-1/+1
| | * | netfilter: xt_addrtype: replace rt6_lookup with nf_afinfo->routeFlorian Westphal2011-04-042-15/+28
| | * | netfilter: af_info: add 'strict' parameter to limit lookup to .oifFlorian Westphal2011-04-044-8/+16
| | * | netfilter: af_info: add network namespace parameter to route hookFlorian Westphal2011-04-044-9/+11
| | * | IPVS: fix NULL ptr dereference in ip_vs_ctl.c ip_vs_genl_dump_daemons()Hans Schillstrom2011-04-041-1/+1
| | * | netfilter: h323: bug in parsing of ASN1 SEQOF fieldDavid Sterba2011-04-041-1/+1
| | * | netfilter: ipset: references are protected by rwlock instead of mutexJozsef Kadlecsik2011-04-045-53/+71
| | * | netfilter: ipset: list:set timeout variant fixesJozsef Kadlecsik2011-04-041-29/+24
* | | | Merge branch 'bugfixes' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6Linus Torvalds2011-04-081-1/+1
|\ \ \ \
| * | | | Revert "net/sunrpc: Use static const char arrays"Trond Myklebust2011-04-061-1/+1
* | | | | Merge branch 'for-linus2' of git://git.profusion.mobi/users/lucas/linux-2.6Linus Torvalds2011-04-07103-160/+160
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix common misspellingsLucas De Marchi2011-03-31103-160/+160
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-0512-30/+69
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | ipv6: Don't pass invalid dst_entry pointer to dst_release().Boris Ostrovsky2011-04-041-0/+1
| | |_|/ | |/| |
| * | | tcp: len check is unnecessarily devastating, change to WARN_ONIlpo Järvinen2011-04-011-1/+2
| * | | sctp: malloc enough room for asconf-ack chunkWei Yongjun2011-04-011-2/+2
| | |/ | |/|
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2011-04-019-27/+64
| |\ \
| | * | mac80211: fix aggregation frame release during timeoutDaniel Halperin2011-03-281-1/+2
| | * | cfg80211: fix BSS double-unlinking (continued)Juuso Oikarinen2011-03-281-7/+11
| | * | cfg80211:: fix possible NULL pointer dereferenceMariusz Kozlowski2011-03-281-3/+10
| | * | mac80211: fix possible NULL pointer dereferenceMariusz Kozlowski2011-03-281-1/+2
| | * | mac80211: fix NULL pointer dereference in ieee80211_key_alloc()Petr Štetiar2011-03-281-2/+2
| | * | mac80211: fix a crash in minstrel_ht in HT mode with no supported MCS ratesFelix Fietkau2011-03-281-7/+18
| | * | Bluetooth: Fix warning with hci_cmd_timerThomas Gleixner2011-03-241-1/+3
| | * | Bluetooth: delete hanging L2CAP channelAndrei Emeltchenko2011-03-241-2/+3
| | * | Bluetooth: Fix missing hci_dev_lock_bh in user_confirm_replyJohan Hedberg2011-03-241-0/+2
| | * | Bluetooth: Fix HCI_RESET command synchronizationGustavo F. Padovan2011-03-242-2/+8
| | * | Bluetooth: Increment unacked_frames count only the first transmitSuraj Sumangala2011-03-241-1/+3
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-04-019-11/+40
|\| | |
| * | | appletalk: Fix OOPS in atalk_release().David S. Miller2011-03-311-5/+6
| * | | sctp: Pass __GFP_NOWARN to hash table allocation attempts.David S. Miller2011-03-301-2/+2
| * | | fib: add rtnl locking in ip_fib_net_exitEric Dumazet2011-03-301-0/+2
| * | | atm/solos-pci: Don't flap VCs when carrier state changesPhilip A. Prindeville2011-03-301-0/+1
| * | | netdev: fix mtu check when TSO is enabledDaniel Lezcano2011-03-301-2/+22
| * | | bridge: mcast snooping, fix length check of snooped MLDv1/2Linus Lüssing2011-03-301-1/+1
| * | | net: gre: provide multicast mappings for ipv4 and ipv6Timo Teräs2011-03-302-0/+5
| * | | bridge: Fix compilation warning in function br_stp_recalculate_bridge_id()Balaji G2011-03-291-1/+1
| | |/ | |/|
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-clientLinus Torvalds2011-03-308-23/+197
|\ \ \ | |/ / |/| |
| * | libceph: Create a new key type "ceph".Tommi Virtanen2011-03-293-8/+77
| * | libceph: Get secret from the kernel keys api when mounting with key=NAME.Tommi Virtanen2011-03-292-0/+59
| * | ceph: Move secret key parsing earlier.Tommi Virtanen2011-03-296-15/+59
| * | libceph: fix null dereference when unregistering linger requestsSage Weil2011-03-291-3/+3
| * | ceph: unlock on error in ceph_osdc_start_request()Dan Carpenter2011-03-291-1/+3