summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2010-08-0455-599/+1021
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-08-024-8/+25
| |\
| | * netfilter: nf_nat: make unique_tuple return voidChangli Gao2010-08-021-4/+4
| | * ipvs: provide default ip_vs_conn_{in,out}_get_protoSimon Horman2010-08-021-0/+12
| | * netfilter: nf_conntrack_extend: introduce __nf_ct_ext_exist()Changli Gao2010-08-021-2/+7
| | * IPVS: make FTP work with full NAT supportHannes Eder2010-07-231-2/+0
| | * nfnetlink_log: do not expose NFULNL_COPY_DISABLED to user-spacePablo Neira Ayuso2010-07-151-0/+2
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2010-07-298-129/+219
| |\ \
| | * | cfg80211: fix dev <-> wiphy typoChristian Lamparter2010-07-291-1/+1
| | * | mac80211: allow drivers to request DTIM periodJohannes Berg2010-07-291-2/+7
| | * | mac80211: inform drivers about the off-channel status on channel changesFelix Fietkau2010-07-281-0/+3
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...John W. Linville2010-07-281-0/+2
| | |\ \
| | | * | Bluetooth: Defer SCO setup if mode change is pendingMarcel Holtmann2010-07-271-0/+2
| | * | | wireless: Convert wiphy_debug macro to functionJoe Perches2010-07-271-2/+3
| | * | | include/net/cfg80211.h: Add wiphy_<level> printk equivalentsJoe Perches2010-07-271-1/+63
| | |/ /
| | * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/holtma...John W. Linville2010-07-2752-519/+889
| | |\ \
| | | * | Bluetooth: Use __packed annotationGustavo F. Padovan2010-07-214-113/+113
| | | * | Bluetooth: Add Google's copyright to L2CAPGustavo F. Padovan2010-07-211-0/+1
| | | * | Bluetooth: Implemented HCI frame reassembly for RX from streamSuraj Sumangala2010-07-211-0/+1
| | | * | Bluetooth: Implement hci_reassembly helper to reassemble RX packetsSuraj Sumangala2010-07-211-0/+1
| | | * | Bluetooth: Add one more buffer for HCI stream reassemblySuraj Sumangala2010-07-211-2/+2
| | | * | Bluetooth: Add Copyright notice to L2CAPGustavo F. Padovan2010-07-211-0/+1
| | | * | Bluetooth: Remove the send_lock spinlock from ERTMGustavo F. Padovan2010-07-211-1/+0
| | | * | Bluetooth: Disconnect early if mode is not supportedGustavo F. Padovan2010-07-211-0/+5
| | | * | Bluetooth: Reassigned copyright to Code Aurora ForumRon Shaffer2010-07-211-1/+1
| | | * | Bluetooth: Remove extraneous white spaceRon Shaffer2010-07-211-7/+7
| | | * | Bluetooth: Add blacklist support for incoming connectionsJohan Hedberg2010-07-212-0/+12
| | * | | lib80211: remove unused host_build_iv optionJohn W. Linville2010-07-261-3/+0
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-07-271-0/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-07-233-7/+9
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | wireless: correct sparse warning in wext-compat.cJohn W. Linville2010-07-201-0/+4
| | * | | | wireless: only use alpha2 regulatory information from country IEJohn W. Linville2010-07-201-1/+0
| | * | | | mac80211: move QoS-enable to BSS infoJohannes Berg2010-07-201-6/+5
| * | | | | net: remove last uses of __attribute__((packed))Gustavo F. Padovan2010-07-211-1/+1
| * | | | | irda: Use __packed annotation instead IRDA_PACKED macroGustavo F. Padovan2010-07-212-13/+9
| | |_|/ / | |/| | |
| * | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-07-201-6/+1
| |\ \ \ \
| * | | | | tcp: sizeof struct tcp_skb_cb is 44Eric Dumazet2010-07-151-5/+4
| * | | | | inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and...Changli Gao2010-07-123-4/+9
| * | | | | net: cleanupsChangli Gao2010-07-123-192/+123
| * | | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-07-072-5/+17
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/...David S. Miller2010-07-022-2/+12
| |\ \ \ \ \
| | * | | | | netfilter: xt_connbytes: Force CT accounting to be enabledTim Gardner2010-06-251-0/+12
| | * | | | | netfilter: nf_nat: support user-specified SNAT rules in LOCAL_INPatrick McHardy2010-06-171-2/+0
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2010-07-012-14/+40
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | cfg80211/mac80211: Update set_tx_power to use mBm instead of dBm unitsJuuso Oikarinen2010-06-241-14/+1
| | * | | | | mac80211: Add interface for driver to temporarily disable dynamic psJuuso Oikarinen2010-06-211-0/+39
| * | | | | | fragment: add fast path for in-order fragmentsChangli Gao2010-06-301-0/+1
| * | | | | | snmp: 64bit ipstats_mib for all archesEric Dumazet2010-06-303-16/+91
| * | | | | | net/neighbour.h: fix typoKulikov Vasiliy2010-06-301-1/+1
| * | | | | | caif-driver: Add CAIF-SPI Protocol driver.Sjur Braendeland2010-06-291-0/+153