summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'pm+acpi-3.19-rc1-2' of git://git.kernel.org/pub/scm/linux/kernel/g...Linus Torvalds2014-12-191-1/+1
|\
| * NFC / PM: Replace CONFIG_PM_RUNTIME with CONFIG_PMRafael J. Wysocki2014-12-151-1/+1
* | Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2014-12-151-1/+0Star
|\ \
| * | nfc: drop owner assignment from platform_driversWolfram Sang2014-10-201-1/+0Star
| |/
* | NFC: st21nfcb: Fix reported errorChristophe Ricard2014-12-021-2/+2
* | NFC: st21nfca: Report error returned by functions instead of -ENODEVChristophe Ricard2014-12-021-3/+3
* | NFC: st21nfcb: Remove useless pr_infoChristophe Ricard2014-12-021-2/+0Star
* | NFC: st21nfcb: Improve ndlc commentChristophe Ricard2014-12-021-1/+1
* | NFC: st21nfca: Rework st21nfca_hci_event_received to route event to relevent ...Christophe Ricard2014-12-024-35/+50
* | NFC: st21nfcb: Remove gpio_irq field in static and dts configurationChristophe Ricard2014-12-021-29/+1Star
* | NFC: st21nfcb: Add of_st21nfcb_i2c_match to MODULE_DEVICE_TABLEChristophe Ricard2014-12-021-0/+3
* | NFC: st21nfca: Remove gpio_irq field in static and dts configurationChristophe Ricard2014-12-021-29/+1Star
* | NFC: st21nfca: Add of_st21nfca_i2c_match to MODULE_DEVICE_TABLEChristophe Ricard2014-12-021-0/+3
* | NFC: Don't include linux/unaligned/access_ok.hJohannes Berg2014-11-282-2/+2
|/
* Merge tag 'master-2014-10-02' of git://git.kernel.org/pub/scm/linux/kernel/gi...David S. Miller2014-10-0610-335/+1003
|\
| * NFC: st21nfca: Fix potential double kfree_skb errorChristophe Ricard2014-09-241-2/+0Star
| * NFC: st21nfca: ERR_PTR vs NULL fixChristophe Ricard2014-09-241-2/+2
| * NFC: st21nfcb: remove error outputChristophe Ricard2014-09-241-3/+1Star
| * NFC: st21nfcb: Add ISO15693 Reader/Writer supportChristophe Ricard2014-09-241-0/+1
| * NFC: nci: Add support for proprietary RF ProtocolsChristophe Ricard2014-09-241-0/+10
| * NFC: st21nfcb: Fix improper ndlc T2 managementChristophe Ricard2014-09-241-1/+5
| * NFC: st21nfcb: Fix improper management of -EREMOTEIO error code.Christophe Ricard2014-09-242-15/+8Star
| * NFC: st21nfca: Fix recursive fault when doing p2p in target mode.Christophe Ricard2014-09-241-7/+4Star
| * NFC: st21nfca: Fix potential skb leaks in NFC-DEP codeChristophe Ricard2014-09-241-2/+9
| * NFC: st21nfca: Fix few coding style issueChristophe Ricard2014-09-241-5/+3Star
| * NFC: trf7970a: Unlock mutex before exiting _trf7970a_tg_listen()Mark A. Greer2014-09-241-4/+4
| * NFC: trf7970a: Unlock mutex before exiting trf7970a_irq()Mark A. Greer2014-09-241-2/+3
| * NFC: trf7970a: Remove unnecessary local variable initializationMark A. Greer2014-09-241-1/+1
| * NFC: trf7970a: Remove useless local variableMark A. Greer2014-09-241-2/+1Star
| * NFC: st21nfcb: Remove useless headersChristophe Ricard2014-09-083-11/+0Star
| * NFC: st21nfca: fix "WARNING: else is not generally useful after a break or re...Christophe Ricard2014-09-081-1/+0Star
| * NFC: st21nfca: Clean up macros alignmentChristophe Ricard2014-09-081-25/+25
| * NFC: st21nfca: Clean up st21nfca.h macrosChristophe Ricard2014-09-082-21/+21
| * NFC: st21nfcb: Fix logic when running into i2c read retryChristophe Ricard2014-09-081-1/+3
| * NFC: st21nfca: Add condition to make sure atr_req->length is valid.Christophe Ricard2014-09-081-0/+5
| * NFC: st21nfca: Remove useless IS_ERR(skb) conditionsChristophe Ricard2014-09-081-20/+0Star
| * NFC: st21nfca: Remove useless err == 0 conditionChristophe Ricard2014-09-081-4/+2Star
| * NFC: st21nfca: Change nfcid3 generationChristophe Ricard2014-09-081-1/+1
| * NFC: st21nfca: Remove useless new line in nfc_err callChristophe Ricard2014-09-071-2/+1Star
| * NFC: st21nfca: Fix logic when setting session_idChristophe Ricard2014-09-071-1/+4
| * NFC: st21nfcb: Remove inappropriate kfree on a previously devm_kzalloc pointerChristophe Ricard2014-09-071-10/+5Star
| * NFC: st21nfcb: Remove useless new line in nfc_err callChristophe Ricard2014-09-071-2/+1Star
| * NFC: st21nfcb: Remove double assignment of .owner in struct device_driverChristophe Ricard2014-09-071-1/+0Star
| * NFC: st21nfcb: Convert to use devm_gpio_request_oneChristophe Ricard2014-09-071-24/+6Star
| * NFC: st21nfcb: Fix scripts/checkpatch.pl error "code indent should use tabs w...Christophe Ricard2014-09-071-1/+1
| * NFC: st21nfca: Fix scripts/checkpatch.pl warnings "Missing a blank line after...Christophe Ricard2014-09-073-0/+4
| * NFC: st21nfca: Fix sparse: cast to restricted __be32Christophe Ricard2014-09-071-2/+2
| * NFC: st21nfca: Convert to use devm_gpio_request_oneAxel Lin2014-09-071-22/+6Star
| * NFC: st21nfca: Remove double assignment of .owner in struct device_driverEmil Goode2014-09-071-1/+0Star
| * NFC: trf7970a: Add Target Mode Detection SupportMark A. Greer2014-09-071-6/+154