summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'nfc-next-3.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-179-33/+331
|\
| * NFC: llcp: Use list_for_each_entry in nfc_llcp_find_local()Axel Lin2014-03-141-2/+2
| * NFC: Move checking valid gb_len value to nfc_llcp_set_remote_gbAxel Lin2014-03-142-6/+5
| * NFC: Remove redundant test for dev->n_targets in nfc_find_targetAxel Lin2014-03-141-3/+0
| * NFC: digital: Rename Type V tags to Type 5 tagsMark A. Greer2014-03-111-1/+1
| * NFC: Use LIST_HEAD() at appropriate placesAxel Lin2014-02-232-6/+2
| * NFC: digital: Use matching_[im|tm]_protocols to check with NFC protocols masksAxel Lin2014-02-231-2/+2
| * NFC: Use list_for_each_entry in nfc_find_se()Axel Lin2014-02-231-2/+2
| * NFC: NCI: Use reinit_completion() at appropriate placesAxel Lin2014-02-232-2/+4
| * NFC: digital: Fix a possible memory leakThierry Escande2014-02-161-5/+13
| * NFC: digital: Add missing break in switch statementThierry Escande2014-02-161-0/+1
| * NFC: digital: Add ISO-DEP support for data exchangeThierry Escande2014-02-163-4/+83
| * NFC: digital: Add poll support for type 4A tag platformThierry Escande2014-02-162-2/+86
| * NFC: Add netlink support for ISO/IEC 15693Mark A. Greer2014-02-161-0/+8
| * NFC: digital: Add Digital Layer support for ISO/IEC 15693Mark A. Greer2014-02-163-0/+124
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-0410-65/+131
|\ \
| * \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-02-282-1/+32
| |\ \
| | * | mac80211: fix association to 20/40 MHz VHT networksJohannes Berg2014-02-271-0/+1
| | * | cfg80211: regulatory: reset regdomain in case of errorJanusz Dziedzic2014-02-251-1/+9
| | * | mac80211: don't validate unchanged AP bandwidth while trackingJohannes Berg2014-02-241-0/+22
| * | | NFC: NCI: Fix NULL pointer dereferenceAmitkumar Karwar2014-02-231-1/+1
| |/ /
| * | mac80211: fix station wakeup powersave raceJohannes Berg2014-02-204-32/+25
| * | mac80211: insert stations before adding to driverJohannes Berg2014-02-201-6/+24
| * | mac80211: fix AP powersave TX vs. wakeup raceEmmanuel Grumbach2014-02-203-4/+22
| * | cfg80211: bugfix in regulatory user hint processInbal Hacohen2014-02-191-1/+1
| * | mac80211: send control port protocol frames to the VO queueFelix Fietkau2014-02-121-0/+5
| * | mac80211: fix memory leakEytan Lifshitz2014-02-111-0/+1
| * | mac80211: fix sched_scan restart on recoveryArik Nemtsov2014-02-111-20/+20
* | | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-037-238/+1484
|\ \ \
| * | | Bluetooth: Remove unnecessary stop_scan_complete functionJohan Hedberg2014-02-282-43/+15
| * | | Bluetooth: Fix trying to disable scanning twiceJohan Hedberg2014-02-282-1/+5
| * | | Bluetooth: Delay LTK encryption to let remote receive all keysJohan Hedberg2014-02-282-3/+22
| * | | Bluetooth: Re-encrypt link after receiving an LTKJohan Hedberg2014-02-282-6/+29
| * | | Bluetooth: Add timeout for LE connection attemptsJohan Hedberg2014-02-282-0/+25
| * | | Bluetooth: Use hdev->init/resp_addr values for smp_c1 functionJohan Hedberg2014-02-281-16/+6
| * | | Bluetooth: Track LE initiator and responder address informationJohan Hedberg2014-02-281-0/+78
| * | | Bluetooth: Fix updating connection state to BT_CONNECT too earlyJohan Hedberg2014-02-281-1/+2
| * | | Bluetooth: Add protections for updating local random addressJohan Hedberg2014-02-282-2/+32
| * | | Bluetooth: Fix clearing SMP keys if pairing failsJohan Hedberg2014-02-281-0/+18
| * | | Bluetooth: Use __le64 type for LE random numbersMarcel Holtmann2014-02-286-25/+22
| * | | Bluetooth: Add timer to force power offJohan Hedberg2014-02-271-3/+13
| * | | Bluetooth: Fix disconnecting connections in non-connected statesJohan Hedberg2014-02-271-4/+40
| * | | Bluetooth: Track LE white list modification via HCI commandsMarcel Holtmann2014-02-281-0/+55
| * | | Bluetooth: Add support for storing LE white list entriesMarcel Holtmann2014-02-281-0/+90
| * | | Bluetooth: Clear all LE white list entries when powering controllerMarcel Holtmann2014-02-281-2/+5
| * | | Bluetooth: Make hci_blacklist_clear function staticMarcel Holtmann2014-02-281-1/+1
| * | | Bluetooth: Add hci_copy_identity_address convenience functionJohan Hedberg2014-02-272-26/+26
| * | | Bluetooth: Add tracking of advertising address typeJohan Hedberg2014-02-271-0/+23
| * | | Bluetooth: Fix response on confirm_nameLukasz Rymanowski2014-02-271-4/+6
| * | | Bluetooth: Update background scan parametersAndre Guedes2014-02-261-0/+15
OpenPOWER on IntegriCloud