summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-01-1318-228/+369
|\
| * mac80211: handle MMPDUs at EOSP correctlyJohannes Berg2014-01-101-13/+57
| * mac80211: reset TX info flags when frame will be reprocessedJohannes Berg2014-01-101-0/+2
| * mac80211: release multiple ACs in uAPSD, fix more-data bugJohannes Berg2014-01-101-42/+40
| * mac80211: fix PS-Poll driver release TIDJohannes Berg2014-01-101-1/+13
| * cfg80211: add sanity check for retry limit in wext-compatUjjal Roy2014-01-091-1/+1
| * cfg80211: Add a function to get the number of supported channelsIlan Peer2014-01-094-26/+20
| * mac80211: allow to set smps mode to OFF in AP modeEmmanuel Grumbach2014-01-071-3/+2
| * mac80211: clean up prepare_for_handlers() return valueJohannes Berg2014-01-071-18/+18
| * mac80211: simplify code in ieee80211_prepare_and_rx_handleEmmanuel Grumbach2014-01-071-3/+1
| * mac80211: clean up garbage in commentEmmanuel Grumbach2014-01-071-1/+1
| * mac80211: sync dtim_count to TSFThomas Pedersen2014-01-065-0/+46
| * cfg80211: fix wext-compat for getting retry valueUjjal Roy2014-01-061-2/+2
| * mac80211: enable WME for peer mesh STAChun-Yeow Yeoh2014-01-061-0/+1
| * mac80211: fix memory leak in register_hw() error pathJohannes Berg2014-01-061-11/+11
| * mac80211: handle station TX latency allocation errorsJohannes Berg2014-01-061-30/+40
| * mac80211: clean up netdev debugfs macros a bitJohannes Berg2014-01-061-27/+33
| * nl80211: move vendor/testmode event skb functions out of ifdefJohannes Berg2014-01-061-49/+49
| * mac80211: add tracing for ieee80211_sta_set_bufferedJohannes Berg2014-01-062-0/+29
| * cfg80211/mac80211: correct qos-map lockingJohannes Berg2013-12-302-1/+3
* | Merge tag 'nfc-next-3.14-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-01-138-40/+91
|\ \
| * | NFC: digital: Set rf tech and crc functions when receiving a PSL_REQThierry Escande2014-01-071-13/+31
| * | NFC: digital: Set current target active on activate_target() callThierry Escande2014-01-072-2/+28
| * | NFC: NCI: Add set_config APIAmitkumar Karwar2014-01-071-0/+16
| * | NFC: NCI: Add setup handlerAmitkumar Karwar2014-01-071-0/+3
| * | NFC: NCI: Don't reverse local general bytesAmitkumar Karwar2014-01-071-6/+0
| * | NFC: NCI: Cancel cmd_timer in nci_close_device()Amitkumar Karwar2014-01-051-0/+2
| * | NFC: digital: Use NFC_NFCID3_MAXSIZE from nfc.hThierry Escande2014-01-041-4/+2
| * | NFC: digital: Fix incorrect use of ERR_PTR and PTR_ERR macrosThierry Escande2014-01-041-2/+2
| * | NFC: Only warn on SE discovery errorSamuel Ortiz2014-01-041-5/+2
| * | NFC: llcp: Use default MIU if none was specified on connectSzymon Janc2014-01-043-3/+1
| * | NFC: llcp: Fix possible memory leak while sending I framesSzymon Janc2014-01-041-1/+3
| * | NFC: Return driver failure upon unknown event receptionSamuel Ortiz2014-01-041-5/+2
| |/
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-01-0813-797/+1941
|\ \
| * | Bluetooth: Fix 6loWPAN peer lookupClaudio Takahasi2014-01-071-2/+2
| * | Bluetooth: Fix setting Universal/Local bitClaudio Takahasi2014-01-071-1/+1
| * | Bluetooth: Remove rfcomm_carrier_raised()Gianluca Anzolin2014-01-061-8/+0
| * | Bluetooth: Always wait for a connection on RFCOMM open()Gianluca Anzolin2014-01-061-8/+38
| * | Bluetooth: Move rfcomm_get_device() before rfcomm_dev_activate()Gianluca Anzolin2014-01-061-16/+16
| * | Bluetooth: Release RFCOMM port when the last user closes the TTYGianluca Anzolin2014-01-061-7/+14
| * | Bluetooth: Default to no security with L2CAP RAW socketsJohan Hedberg2014-01-061-0/+3
| * | Bluetooth: Fix NULL pointer dereference when disconnectingJohan Hedberg2014-01-061-1/+1
| * | Bluetooth: Add quirk for disabling Delete Stored Link Key commandMarcel Holtmann2014-01-041-1/+6
| * | 6lowpan: cleanup udp compress functionAlexander Aring2013-12-171-5/+15
| * | 6lowpan: udp use subtraction on both conditionsAlexander Aring2013-12-171-1/+1
| * | 6lowpan: udp use lowpan_fetch_skb functionAlexander Aring2013-12-171-19/+18
| * | 6lowpan: add udp warning for elided checksumAlexander Aring2013-12-172-3/+9
| * | 6lowpan: fix udp byte orderingAlexander Aring2013-12-171-19/+20
| * | 6lowpan: fix udp compress orderingAlexander Aring2013-12-171-1/+1
| * | 6lowpan: udp use lowpan_push_hc_data functionAlexander Aring2013-12-171-17/+20
OpenPOWER on IntegriCloud