summaryrefslogtreecommitdiffstats
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-05-011-1/+2
|\
| * Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2012-04-271-1/+2
| |\
| | * Bluetooth: Temporary keys should be retained during connectionVishal Agarwal2012-04-161-0/+1
| | * Bluetooth: hci_persistent_key should return boolVishal Agarwal2012-04-161-1/+1
* | | net: fix sk_sockets_allocated_read_positiveEric Dumazet2012-04-301-2/+2
* | | Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-04-301-1/+3
|\ \ \
| * | | ipvs: kernel oops - do_ip_vs_get_ctlHans Schillstrom2012-04-301-0/+2
| * | | ipvs: take care of return value from protocol init_netnsHans Schillstrom2012-04-301-1/+1
* | | | set fake_rtable's dst to NULL to avoid kernel OopsPeter Huang (Peng)2012-04-241-0/+1
* | | | net/sock.h: fix sk_peek_off kernel-doc warningRandy Dunlap2012-04-171-0/+1
* | | | ipv6: clean up rt6_clean_expiresJiri Bohac2012-04-171-1/+1
* | | | ipv6: fix rt6_update_expiresJiri Bohac2012-04-171-2/+8
* | | | net_sched: red: Make minor corrections to commentsDavid Ward2012-04-161-3/+3
* | | | ipv6: fix problem with expired dst cacheGao feng2012-04-132-1/+47
| |/ / |/| |
* | | mac80211: Convert WARN_ON to WARN_ON_ONCELarry Finger2012-04-091-1/+1
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/blueto...John W. Linville2012-04-093-7/+10
|\ \ \ | |/ / |/| / | |/
| * Bluetooth: Fix userspace compatibility issue with mgmt interfaceGustavo Padovan2012-04-051-1/+1
| * Bluetooth: mgmt: Fix timeout typeAndrei Emeltchenko2012-03-281-1/+1
| * Bluetooth: Check for minimum data length in eir_has_data_type()Johan Hedberg2012-03-281-0/+3
| * Bluetooth: Don't increment twice in eir_has_data_type()Johan Hedberg2012-03-281-4/+3
| * Bluetooth: hci_core: fix NULL-pointer dereference at unregisterJohan Hovold2012-03-281-0/+1
| * Bluetooth: Use correct flags for checking HCI_SSP_ENABLED bitHemant Gupta2012-03-281-1/+1
* | Merge branch 'master' of git://1984.lsi.us.es/netDavid S. Miller2012-04-031-1/+1
|\ \
| * | netfilter: xt_LOG: don't use xchg() for simple assignmentJan Beulich2012-03-261-1/+1
* | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...David S. Miller2012-03-271-2/+4
|\ \ \ | | |/ | |/|
| * | cfg80211: allow CFG80211_SIGNAL_TYPE_UNSPEC in station_infoJohn W. Linville2012-03-261-2/+4
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-03-272-1/+5
|\ \ \ | | |/ | |/|
| * | netfilter: cttimeout: fix dependency with l4protocol conntrack modulePablo Neira Ayuso2012-03-232-1/+5
| |/
* | Merge tag 'device-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/p...Linus Torvalds2012-03-241-1/+2
|\ \
| * | device.h: audit and cleanup users in main include dirPaul Gortmaker2012-03-161-1/+2
* | | Merge tag 'bug-for-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/paul...Linus Torvalds2012-03-2410-0/+10
|\ \ \
| * | | BUG: headers with BUG/BUG_ON etc. need linux/bug.hPaul Gortmaker2012-03-0410-0/+10
* | | | poll: add poll_requested_events() and poll_does_not_wait() functionsHans Verkuil2012-03-231-1/+1
* | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2012-03-211-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | switch unix_sock to struct pathAl Viro2012-03-201-2/+1
* | | | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2012-03-211-0/+2
|\ \ \ \
| * | | | security: trim security.hAl Viro2012-02-141-0/+2
* | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2012-03-2034-583/+1082
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-03-162-47/+9
| |\ \ \ \ \
| | * | | | | mac80211: rename bss_conf timestamp to last_tsfJohannes Berg2012-03-131-2/+3
| | * | | | | cfg80211: clarify timestamp in cfg80211_inform_bssJohannes Berg2012-03-131-4/+3
| | * | | | | mac80211: remove tx_syncJohannes Berg2012-03-121-41/+0
| | * | | | | cfg80211: Add background scan period attribute.Bala Shanmugam2012-03-121-0/+3
| * | | | | | net: ipv4: Standardize prefixes for message loggingJoe Perches2012-03-121-2/+2
| * | | | | | net: get rid of some pointless casts to sockaddrMaciej Żenczykowski2012-03-111-1/+1
| * | | | | | ipv4: Make ip_call_ra_chain() return bool.David S. Miller2012-03-091-1/+1
| * | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-03-091-1/+3
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| * | | | | | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-03-094-34/+47
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | mac80211: update ieee80211_tx_rate_control kerneldocSimon Wunderlich2012-03-081-4/+5
| | * | | | | NFC: NCI code identation fixesSamuel Ortiz2012-03-061-5/+5
OpenPOWER on IntegriCloud