summaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-04-122-2/+2
|\
| * net: Fix use after free by removing length arg from sk_data_ready callbacks.David S. Miller2014-04-112-2/+2
* | Merge tag 'for-linus-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/e...Linus Torvalds2014-04-112-5/+4
|\ \ | |/ |/|
| * 9pnet: p9_client->conn field is unused. Remove it.Simon Derr2014-03-251-2/+0
| * 9P: Get rid of REQ_STATUS_FLSHSimon Derr2014-03-251-2/+0
| * 9P: Add cancelled() to the transport functions.Simon Derr2014-03-251-0/+3
| * 9P: Add memory barriers to protect request fields over cb/rpc threads handoffDominique Martinet2014-03-251-1/+1
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2014-04-081-2/+2
|\ \
| * | netfilter: nf_conntrack: reserve two bytes for nf_ct_ext->lenAndrey Vagin2014-04-031-2/+2
* | | Merge branch 'for-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2014-04-032-17/+2
|\ \ \ | |/ / |/| |
| * | cgroup: clean up cgroup_subsys names and initializationTejun Heo2014-02-082-2/+2
| * | cgroup: make CONFIG_CGROUP_NET_PRIO bool and drop unnecessary init_netclassid...Tejun Heo2014-02-081-15/+0
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2014-04-0249-289/+1478
|\ \
| * | mac802154: make csma/cca parameters per-wpanPhoebe Buckheister2014-04-011-0/+17
| * | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-03-311-1/+2
| |\ \
| | * \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-311-1/+2
| | |\ \
| | | * \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-271-1/+2
| | | |\ \
| | | | * | Bluetooth: Track current configured LE scan type parameterMarcel Holtmann2014-03-211-0/+1
| | | | * | Bluetooth: Fix passkey endianess in user_confirm and notify_passkeyJohan Hedberg2014-03-191-1/+1
| * | | | | ipv6: reuse rt6_need_strictWang Yufen2014-03-311-0/+5
| |/ / / /
| * | | | net: filter: move filter accounting to filter coreDaniel Borkmann2014-03-311-27/+0
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-291-1/+3
| |\ \ \ \
| * | | | | ipv6: do not overwrite inetpeer metrics prematurelyMichal Kubeček2014-03-272-3/+11
| * | | | | net: Rename skb->rxhash to skb->hashTom Herbert2014-03-261-2/+2
| * | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-251-5/+6
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-03-257-20/+63
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-217-20/+63
| | |\ \ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | * | | | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-202-1/+22
| | | |\ \ \ \ \ | | | | | |_|/ / | | | | |/| | |
| | | | * | | | Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2014-03-101-2/+3
| | | | * | | | Bluetooth: Add support for handling signature resolving keysMarcel Holtmann2014-03-092-0/+20
| | | * | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-03-203-19/+31
| | | |\ \ \ \ \
| | | | * | | | | mac80211: set beamforming bit in radiotapEmmanuel Grumbach2014-03-191-0/+2
| | | | * | | | | cfg80211/mac80211: ignore signal if the frame was heard on wrong channelEmmanuel Grumbach2014-03-191-8/+8
| | | | * | | | | mac80211: add status_driver_data array to ieee80211_tx_infoEliad Peller2014-03-191-2/+2
| | | | * | | | | cfg80211: DFS get CAC time from regulatory databaseJanusz Dziedzic2014-02-251-1/+4
| | | | * | | | | cfg80211: regulatory: allow getting DFS CAC time from userspaceJanusz Dziedzic2014-02-252-8/+15
| | | * | | | | | Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-172-0/+10
| | | |\ \ \ \ \ \
| | | | * | | | | | NFC: digital: Rename Type V tags to Type 5 tagsMark A. Greer2014-03-111-1/+1
| | | | * | | | | | NFC: digital: Add poll support for type 4A tag platformThierry Escande2014-02-161-0/+3
| | | | * | | | | | NFC: Add ISO/IEC 15693 header definitionsMark A. Greer2014-02-162-0/+7
| * | | | | | | | | ipv4: remove ip_rt_dump from route.cLi RongQing2014-03-241-1/+0
| * | | | | | | | | net: optimize csum_replace2()Eric Dumazet2014-03-241-2/+21
| |/ / / / / / / /
| * | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2014-03-181-22/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | xfrm6: Remove xfrm_tunnel_notifierSteffen Klassert2014-03-141-8/+0
| | * | | | | | | | xfrm6: Add IPsec protocol multiplexerSteffen Klassert2014-03-141-0/+15
| | * | | | | | | | xfrm: Introduce xfrm_input_afinfo to access the the callbacks properlySteffen Klassert2014-03-141-12/+11
| | * | | | | | | | xfrm: rename struct xfrm_filterNicolas Dichtel2014-03-071-2/+2
| * | | | | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/...David S. Miller2014-03-175-18/+47
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | netfilter: nf_tables: restore context for expression destructorsPatrick McHardy2014-03-081-9/+4
| | * | | | | | | | | netfilter: conntrack: remove central spinlock nf_conntrack_lockJesper Dangaard Brouer2014-03-072-1/+8
OpenPOWER on IntegriCloud