aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-09-074-6/+44
|\
| * Bluetooth: Change signature of smp_conn_security()Vinicius Costa Gomes2012-08-271-1/+1
| * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-08-021-0/+2
| |\
| | * cfg80211: add channel flag to prohibit OFDM operationSeth Forshee2012-08-021-0/+2
| * | Fix unexpected SA hard expiration after changing dateFan Du2012-08-021-0/+4
| * | tcp: Apply device TSO segment limit earlierBen Hutchings2012-08-021-0/+2
| * | Merge branch 'akpm' (Andrew's patch-bomb)Linus Torvalds2012-07-311-5/+35
| |\ \
| | * | netvm: prevent a stream-specific deadlockMel Gorman2012-07-311-3/+5
| | * | netvm: set PF_MEMALLOC as appropriate during SKB processingMel Gorman2012-07-311-0/+5
| | * | netvm: allow skb allocation to use PFMEMALLOC reservesMel Gorman2012-07-311-0/+15
| | * | netvm: allow the use of __GFP_MEMALLOC by specific socketsMel Gorman2012-07-311-1/+4
| | * | net: introduce sk_gfp_atomic() to allow addition of GFP flags depending on th...Mel Gorman2012-07-311-0/+5
| | * | memcg: rename config variablesAndrew Morton2012-07-311-2/+2
* | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-09-071-0/+1
|\ \ \ \
| * | | | cfg80211: add kerneldoc entry for "vht_cap"Robert P. J. Day2012-09-051-0/+1
* | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-08-213-21/+117
|\| | | |
| * | | | mac80211: add IEEE80211_HW_P2P_DEV_ADDR_FOR_INTFJohannes Berg2012-08-201-0/+5
| * | | | cfg80211: add P2P Device abstractionJohannes Berg2012-08-201-2/+38
| * | | | mac80211: support A-MPDU status reportingJohannes Berg2012-08-201-14/+39
| * | | | wireless: add radiotap A-MPDU status fieldJohannes Berg2012-08-201-0/+11
| * | | | mac80211: add supported rates change notification in IBSSAntonio Quartulli2012-08-201-0/+4
| * | | | mac80211: move TX station pointer and restructure TXThomas Huehn2012-07-311-5/+15
| * | | | mac80211: add PS flag to bss_confEliad Peller2012-07-311-0/+5
| | |/ / | |/| |
* | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2012-08-105-34/+34
|\ \ \ \ | |_|/ / |/| | |
| * | | Bluetooth: Fix hci_le_conn_complete_evtAndre Guedes2012-08-061-0/+2
| * | | Bluetooth: /proc/net/ entries for bluetooth protocolsMasatake YAMATO2012-08-061-0/+10
| * | | Bluetooth: Free the l2cap channel list only when refcount is zeroJaganath Kanakkassery2012-08-061-1/+0
| * | | Bluetooth: Move l2cap_chan_hold/put to l2cap_core.cJaganath Kanakkassery2012-08-061-14/+2
| * | | Bluetooth: Make connect / disconnect cfm functions return voidAndrei Emeltchenko2012-08-061-4/+4
| * | | Bluetooth: Define AMP controller statusesAndrei Emeltchenko2012-08-061-0/+9
| * | | Bluetooth: trivial: Fix mixing spaces and tabs in smpAndrei Emeltchenko2012-08-061-4/+4
| * | | Bluetooth: debug: Fix printing refcnt for hci_connAndrei Emeltchenko2012-08-061-4/+2
| * | | Bluetooth: mgmt: Managing only BR/EDR HCI controllersAndrei Emeltchenko2012-08-061-1/+1
| * | | Bluetooth: Remove missing codeAndre Guedes2012-08-061-6/+0
| |/ /
* | | ipv4: Properly purge netdev references on uncached routes.David S. Miller2012-07-311-0/+3
* | | ipv4: Cache routes in nexthop exception entries.David S. Miller2012-07-311-0/+1
* | | ipv4: percpu nh_rth_output cacheEric Dumazet2012-07-311-1/+2
* | | ipv4: Restore old dst_free() behavior.Eric Dumazet2012-07-313-10/+11
* | | ipv4: remove rt_cache_rebuild_countEric Dumazet2012-07-301-2/+0
* | | net: ipv4: fix RCU races on dst refcountsEric Dumazet2012-07-302-6/+14
|/ /
* | ipv6: Early TCP socket demuxEric Dumazet2012-07-262-6/+9
* | ipv4: Fix input route performance regression.David S. Miller2012-07-261-2/+17
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-07-2464-652/+1383
|\
| * ipv4: Change rt->rt_iif encoding.David S. Miller2012-07-231-1/+5
| * ipv4: Prepare for change of rt->rt_iif encoding.David S. Miller2012-07-231-0/+1
| * tcp: dont drop MTU reduction indicationsEric Dumazet2012-07-231-0/+1
| * Merge branch 'kill_rtcache'David S. Miller2012-07-225-32/+30
| |\
| | * ipv4: Kill rt->fiDavid S. Miller2012-07-201-1/+0
| | * ipv4: Turn rt->rt_route_iif into rt->rt_is_input.David S. Miller2012-07-201-3/+3
| | * ipv4: Kill rt->rt_oifDavid S. Miller2012-07-201-1/+0