summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'kmap_atomic' of git://github.com/congwang/linuxLinus Torvalds2012-03-2112-41/+36
|\
| * sunrpc: remove the second argument of k[un]map_atomic()Cong Wang2012-03-204-18/+18
| * rds: remove the second argument of k[un]map_atomic()Cong Wang2012-03-207-21/+16
| * net: remove the second argument of k[un]map_atomic()Cong Wang2012-03-201-2/+2
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2012-03-202-2/+2
|\ \
| * | rds: Fix typo in iw_recv.c and ib_recv.cMasanari Iida2012-02-092-2/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-20273-8740/+13374
|\ \ \
| * | | Fix pppol2tp getsockname()Benjamin LaHaise2012-03-201-1/+1
| * | | Remove printk from rds_sendmsgDave Jones2012-03-201-1/+0
| * | | ipv6: fix incorrent ipv6 ipsec packet fragmentGao feng2012-03-201-5/+6
| * | | tcp: reduce out_of_order memory useEric Dumazet2012-03-192-1/+19
| * | | tcp: introduce tcp_data_queue_ofoEric Dumazet2012-03-191-99/+115
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-186-31/+41
| |\ \ \ | | | |/ | | |/|
| * | | arp: allow arp processing to honor per interface arp_accept sysctlNeil Horman2012-03-161-1/+1
| * | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-03-1617-431/+355
| |\ \ \
| | * | | mac80211: make uapsd_* keys per-vifEliad Peller2012-03-156-102/+79
| | * | | mac80211: add NULL terminator to debugfs_netdev write bufEliad Peller2012-03-151-8/+5
| | * | | mac80211: Don't sample max throughput rate in minstrel_htHelmut Schaa2012-03-151-0/+7
| | * | | mac80211: Don't let regulatory make us deafPaul Stewart2012-03-134-19/+51
| | * | | mac80211: rename bss_conf timestamp to last_tsfJohannes Berg2012-03-132-2/+2
| | * | | cfg80211: clarify timestamp in cfg80211_inform_bssJohannes Berg2012-03-131-4/+3
| | * | | mac80211: linearize SKBs as needed for cryptoJohannes Berg2012-03-133-8/+31
| | * | | mac80211: move RX WEP weak IV countingJohannes Berg2012-03-133-12/+6
| | * | | mac80211: set basic rates earlierJohannes Berg2012-03-121-48/+49
| | * | | mac80211: refactor common auth/assoc setup codeJohannes Berg2012-03-121-62/+59
| | * | | mac80211: remove spurious BSSID change flagJohannes Berg2012-03-121-3/+0
| | * | | mac80211: simplify wmm check during associationJohannes Berg2012-03-122-6/+6
| | * | | mac80211: simplify HT checksJohannes Berg2012-03-121-31/+26
| | * | | mac80211: move misplaced commentJohannes Berg2012-03-121-7/+7
| | * | | mac80211: Disable MCS > 7 in minstrel_ht when STA uses static SMPSHelmut Schaa2012-03-121-0/+9
| | * | | mac80211: set channel back after disassociatingJohannes Berg2012-03-121-7/+6
| | * | | mac80211: remove tx_syncJohannes Berg2012-03-124-120/+0
| | * | | mac80211: Limit TID buffering during BA session setup/teardownHelmut Schaa2012-03-121-0/+6
| | * | | cfg80211: Add background scan period attribute.Bala Shanmugam2012-03-122-0/+11
| * | | | net: ipv4: Standardize prefixes for message loggingJoe Perches2012-03-1219-48/+79
| * | | | net: Convert printks to pr_<level>Joe Perches2012-03-1125-181/+163
| * | | | net: get rid of some pointless casts to sockaddrMaciej Żenczykowski2012-03-113-24/+16
| * | | | ipv6: Fix Smatch warning.Li Wei2012-03-111-1/+1
| * | | | caif: make zero a legal caif connetion id.sjur.brandeland@stericsson.com2012-03-111-3/+6
| * | | | caif: Fix for a race in socket transmit with flow control.Dmitry Tarnyagin2012-03-116-24/+31
| * | | | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2012-03-1114-194/+145
| |\ \ \ \
| | * | | | batman-adv: Remove spaces after a castSven Eckelmann2012-03-112-3/+3
| | * | | | batman-adv: Use {} braces consistent on the arms of a statementSven Eckelmann2012-03-111-1/+2
| | * | | | batman-adv: Don't begin block comments with only a /* lineSven Eckelmann2012-03-112-13/+3
| | * | | | batman-adv: Ignore 80-chars per line limits for stringsSven Eckelmann2012-03-1112-177/+137
| * | | | | ipv4: Make ip_rcv_options() return bool.David S. Miller2012-03-091-3/+3
| * | | | | ipv4: Make ip_call_ra_chain() return bool.David S. Miller2012-03-091-4/+4
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-0912-48/+164
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-03-0935-492/+899
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | mac80211: fix smatch lock errors in meshThomas Pedersen2012-03-071-10/+10