summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-042-1/+2
|\
| * sctp: stop pending timers and purge queues when peer restart asocWei Yongjun2011-05-312-1/+2
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-273-1/+11
|\ \ | |/
| * net: Kill ratelimit.h dependency in linux/net.hDavid S. Miller2011-05-271-0/+8
| * net: Add linux/sysctl.h includes where needed.David S. Miller2011-05-271-0/+1
| * Merge branch 'pablo/nf-2.6-updates' of git://1984.lsi.us.es/net-2.6David S. Miller2011-05-271-1/+2
| |\
| | * IPVS: bug in ip_vs_ftp, same list heaad used in all netns.Hans Schillstrom2011-05-271-1/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/linux-2.6-nsfdLinus Torvalds2011-05-251-0/+1
|\ \ \
| * | | net: Allow setting the network namespace by fdEric W. Biederman2011-05-101-0/+1
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-252-2/+8
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'for-davem' of ssh://master.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2011-05-251-2/+6
| |\ \ \
| | * \ \ Merge ssh://master.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next...John W. Linville2011-05-242-3/+8
| | |\ \ \
| | | * | | wireless: fix fatal kernel-doc error + warning in mac80211.hRandy Dunlap2011-05-241-1/+2
| | | * | | wireless: fix cfg80211.h new kernel-doc warningsRandy Dunlap2011-05-241-1/+2
| | | * | | cfg80211: Use consistent BSS matching between scan and smeJouni Malinen2011-05-191-1/+4
| * | | | | dst: catch uninitialized metricsStephen Hemminger2011-05-241-0/+2
| | |_|_|/ | |/| | |
* | | | | 9p: Small cleanup in <net/9p/9p.h>Sasha Levin2011-05-251-2/+1
* | | | | 9p: typo fixes and minor cleanupsRob Landley2011-05-253-7/+8
|/ / / /
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2011-05-232-2/+2
|\ \ \ \
| * | | | treewide: fix a few typos in commentsJustin P. Mattock2011-05-102-2/+2
| | |_|/ | |/| |
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-05-231-15/+21
|\ \ \ \
| * | | | caif: Update documentation of CAIF transmit and receive functions.sjur.brandeland@stericsson.com2011-05-221-15/+21
| | |/ / | |/| |
* | | | wireless: fix fatal kernel-doc error + warning in mac80211.hRandy Dunlap2011-05-221-1/+2
|/ / /
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-05-2055-561/+1100
|\ \ \
| * | | ipv6: reduce per device ICMP mib sizesEric Dumazet2011-05-193-7/+30
| * | | ipv4: Pass explicit destination address to rt_bind_peer().David S. Miller2011-05-181-2/+2
| * | | ipv4: Pass explicit destination address to rt_get_peer().David S. Miller2011-05-181-1/+1
| * | | ipv4: Make caller provide flowi4 key to inet_csk_route_req().David S. Miller2011-05-181-0/+1
| * | | ipv4: Kill RT_CACHE_DEBUGDavid S. Miller2011-05-181-7/+0
| * | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-05-172-7/+17
| |\ \ \
| * | | | net: ping: fix build failureVasiliy Kulikov2011-05-171-2/+0
| * | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-05-164-10/+303
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | cfg80211: make stripping of 802.11 header optional from AMSDUYogesh Ashok Powar2011-05-161-1/+3
| | * | | nl80211: Move peer link state definition to nl80211Javier Cardona2011-05-161-27/+0
| | * | | cfg80211: advertise possible interface combinationsJohannes Berg2011-05-161-0/+88
| | * | | cfg80211/mac80211: avoid bounce back mac->cfg->mac on sched_scan_stoppedLuciano Coelho2011-05-121-2/+1
| | * | | cfg80211: restrict AP beacon intervalsJohannes Berg2011-05-121-0/+4
| | * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/padova...John W. Linville2011-05-122-3/+7
| | |\ \ \
| | | * | | Bluetooth: Double check sec req for pre 2.1 deviceWaldemar Rymarkiewicz2011-05-111-0/+1
| | | * | | Bluetooth: Remove l2cap_sk_listGustavo F. Padovan2011-05-051-3/+3
| | | * | | Bluetooth: Handle psm == 0 case inside l2cap_add_psm()Gustavo F. Padovan2011-05-051-1/+0
| | | * | | Bluetooth: Add l2cap_add_psm() and l2cap_add_scid()Gustavo F. Padovan2011-05-051-0/+4
| | * | | | cfg80211/nl80211: add interval attribute for scheduled scansLuciano Coelho2011-05-111-0/+2
| | * | | | mac80211: add support for HW scheduled scanLuciano Coelho2011-05-111-0/+50
| | * | | | cfg80211/nl80211: add support for scheduled scansLuciano Coelho2011-05-111-0/+57
| | * | | | nl80211: Let userspace drive the peer link management states.Javier Cardona2011-05-111-0/+29
| | * | | | nl80211: Introduce NL80211_MESH_SETUP_USERSPACE_AMPEJavier Cardona2011-05-111-1/+3
| | * | | | mac80211: add basic support for WoWLANJohannes Berg2011-05-051-0/+16
| | * | | | nl80211/cfg80211: WoWLAN supportJohannes Berg2011-05-051-2/+72
| | * | | | cfg80211: Remove unused wiphy flagJouni Malinen2011-05-051-3/+0
OpenPOWER on IntegriCloud