summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-09-30148-3413/+3919
|\
| * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-09-28148-3413/+3919
| |\
| | * Merge tag 'nfc-next-3.7-2' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2012-09-287-25/+202
| | |\
| | | * NFC: Fix sleeping in atomic when releasing socketSzymon Janc2012-09-271-5/+5
| | | * NFC: Fix sleeping in invalid context when netlink socket is closedSzymon Janc2012-09-271-7/+39
| | | * NFC: Add dummy nfc_llc_shdlc_register definitionJohn W. Linville2012-09-271-0/+8
| | | * NFC: LLCP raw socket supportThierry Escande2012-09-275-4/+148
| | | * NFC: Fix missing mutex unlock in pn533_send_cmd_frame_asyncSzymon Janc2012-09-271-7/+8
| | | * NFC: Use dynamic initialization for rwlocksSzymon Janc2012-09-271-2/+2
| | * | nfc: add dummy nfc_llc_shdlc_register definitionJohn W. Linville2012-09-261-0/+8
| | |/
| | * ath5k: add missing breaks in ath5k_hw_set_spur_mitigation_filterJohn W. Linville2012-09-251-0/+2
| | * ath9k_hw: fix BT sleep state on chip wakeupRajkumar Manoharan2012-09-251-1/+1
| | * rt2x00: Replace open coded interface checking with interface combinations.Gertjan van Wingerde2012-09-253-39/+47
| | * rt2x00: Deprecate max_sta_intf field of struct rt2x00_ops.Gertjan van Wingerde2012-09-259-11/+2
| | * mwifiex: potential corruption in mwifiex_update_uap_custom_ie()Dan Carpenter2012-09-251-1/+1
| | * ath9k: Disable ASPM only for AR9285Sujith Manoharan2012-09-251-2/+3
| | * Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw...John W. Linville2012-09-252-5/+6
| | |\
| | | * iwlwifi: fix async station command crashJohannes Berg2012-09-201-3/+4
| | | * iwlwifi: use eth_broadcast_addrJohannes Berg2012-09-191-2/+2
| | * | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-09-2517-39/+132
| | |\ \
| | | * | cfg80211: Fix regulatory check for 60GHz band frequenciesVladimir Kondratiev2012-09-251-5/+14
| | | * | rfkill: prevent unnecessary event generationVitaly Wool2012-09-241-1/+7
| | | * | mac80211: don't send delBA on addBA failureJohannes Berg2012-09-211-1/+1
| | | * | mac80211: don't send delBA when removing stationsJohannes Berg2012-09-211-1/+1
| | | * | mac80211: don't send delBA before disassocJohannes Berg2012-09-211-1/+1
| | | * | mac80211: fix IBSS auth TX debug messageSylvain Roger Rieunier2012-09-201-1/+1
| | | * | cfg80211: constify name parameter to add_virtual_intfJohannes Berg2012-09-196-7/+8
| | | * | mac80211: make reset debugfs depend on CONFIG_PMJohannes Berg2012-09-191-0/+4
| | | * | cfg80211/nl80211: Notify connection request failure in AP modePandiyarajan Pitchaimuthu2012-09-185-0/+93
| | | * | cfg80211: remove obsolete comment for .sched_scan_stop() callbackArend van Spriel2012-09-181-3/+1
| | | * | wireless: remove unreachable codeAlan Cox2012-09-181-19/+1
| | * | | Merge tag 'nfc-next-3.7-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s...John W. Linville2012-09-2530-1686/+1283
| | |\ \ \
| | | * | | NFC: Fix typo negociating -> negotiatingWaldemar Rymarkiewicz2012-09-251-5/+5
| | | * | | NFC: Don't handle consequent RSET frames after UAWaldemar Rymarkiewicz2012-09-251-7/+31
| | | * | | NFC: Handle RSET in SHDLC_CONNECTING stateWaldemar Rymarkiewicz2012-09-251-1/+2
| | | * | | NFC: xmit from hci ops must return 0 or negativeWaldemar Rymarkiewicz2012-09-252-2/+11
| | | * | | MAINTAINERS: Add NFC specific mailing listSamuel Ortiz2012-09-251-0/+1
| | | * | | NFC: Remove the pn544 raw driverCong Wang2012-09-254-918/+0
| | | * | | NFC: Add HCI module descriptionEric Lapuyade2012-09-251-0/+1
| | | * | | NFC: Fix LLC registration definitions for ANSI complianceEric Lapuyade2012-09-252-2/+2
| | | * | | NFC: Move the pn544_hci dereference below the NULL testWei Yongjun2012-09-251-3/+6
| | | * | | NFC: Move the nfcwilink dereference below the NULL testWei Yongjun2012-09-251-2/+2
| | | * | | NFC: Remove unneeded LLC symbols exportSamuel Ortiz2012-09-253-17/+1
| | | * | | NFC: Changed HCI and PN544 HCI driver to use the new HCI LLC CoreEric Lapuyade2012-09-258-1152/+164
| | | * | | NFC: Add an shdlc llc module to llc coreEric Lapuyade2012-09-255-2/+852
| | | * | | NFC: Add a nop (passthrough) llc module to llc coreEric Lapuyade2012-09-255-2/+107
| | | * | | NFC: Add an LLC Core layer to HCIEric Lapuyade2012-09-255-1/+292
| | | * | | NFC: Modified hci_transceive to become an asynchronous operationEric Lapuyade2012-09-255-39/+92
| | | * | | NFC: Add a public nfc_hci_send_cmd_async methodEric Lapuyade2012-09-252-1/+36
| | | * | | NFC: Changed the HCI cmd execution callback prototypeEric Lapuyade2012-09-254-24/+21