summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-07-098-49/+604
|\
| * NFC: mei_phy: Clean up fileValentin Ilie2013-06-141-3/+3
| * NFC: Add a nfc hardware simulation driverThierry Escande2013-06-143-0/+552
| * NFC: pn533: Fix ACR122 related debug outputOlivier Guiter2013-06-141-4/+4
| * NFC: Remove the static supported_se fieldSamuel Ortiz2013-06-144-10/+4
| * NFC: pn533: Copy NFCID2 through ATR_REQSamuel Ortiz2013-06-141-1/+13
| * NFC: pn533: Use 0x3 for SENSF_REQ Time Slot Number (TSN)Samuel Ortiz2013-06-141-2/+2
| * NFC: NCI: Fix skb->dev usageFrederic Danis2013-06-141-12/+5
| * NFC: pn533: Fix error return code in pn533_probe()Wei Yongjun2013-06-141-1/+3
| * NFC: pn544: Remove Felica and Jewel device presence checkArron Wang2013-06-141-6/+3
| * NFC: pn544: Identify Type F NFC-DEP through NFCID2Arron Wang2013-06-141-10/+15
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2013-07-041-1/+1
|\ \ | |/ |/|
| * treewide: Fix typo in printkMasanari Iida2013-05-281-1/+1
* | NFC: mei: Do not disable MEI devices from their remove routineSamuel Ortiz2013-05-212-4/+0
* | NFC: mei_phy: Register event callback when enabling the deviceSamuel Ortiz2013-05-213-26/+19
* | NFC: mei_phy depends on INTEL_MEISamuel Ortiz2013-05-211-1/+1
|/
* NFC: pn544: Add MEI physical layerSamuel Ortiz2013-04-163-1/+135
* NFC: mei: Add a common mei bus API for NFC driversEric Lapuyade2013-04-166-131/+215
* NFC: pn533: Turn radio on and off when bringing the device up and downSamuel Ortiz2013-04-111-4/+35
* NFC: pn533: Add missing usb_put_devMarina Makienko2013-04-111-0/+1
* NFC: pn533: Increase version numberWaldemar Rymarkiewicz2013-04-111-1/+1
* NFC: pn533: Remove unused pn533_cmd_complete_tWaldemar Rymarkiewicz2013-04-111-2/+0
* NFC: pn533: Add pn533_abort_cmd procedureWaldemar Rymarkiewicz2013-04-111-14/+21
* NFC: pn533: Add support for ACS ACR122U readerWaldemar Rymarkiewicz2013-04-111-2/+217
* NFC: pn533: Add protocol type for frame opsWaldemar Rymarkiewicz2013-04-111-3/+18
* NFC: pn533: Move wq_in_error to cmd contextWaldemar Rymarkiewicz2013-04-111-12/+12
* NFC: pn533: Re-group fields in struct pn533Waldemar Rymarkiewicz2013-04-111-9/+8
* NFC: pn533: Avoid function declarationsWaldemar Rymarkiewicz2013-04-111-12/+10
* NFC: pn533: Simplify __pn533_send_frame_asyncWaldemar Rymarkiewicz2013-04-111-17/+9
* NFC: pn533: Fix incorrect kfree of complete argsWaldemar Rymarkiewicz2013-04-111-1/+1
* NFC: pn533: Remove redundant cmd_ prefix in the structWaldemar Rymarkiewicz2013-04-111-4/+4
* NFC: pn533: Keep cmd context in pn533 structWaldemar Rymarkiewicz2013-04-111-5/+12
* NFC: pn533: Optimise issued cmd context trackingWaldemar Rymarkiewicz2013-04-111-52/+35
* NFC: pn533: Fix memleak while scheduling next cmdWaldemar Rymarkiewicz2013-04-111-2/+8
* NFC: pn533: Rename pn533_fw_reset appropriatelyWaldemar Rymarkiewicz2013-04-111-3/+3
* NFC: pn533: Update copyrights noteWaldemar Rymarkiewicz2013-04-111-6/+4
* NFC: pn533: Fix div by zero while stopping pollingWaldemar Rymarkiewicz2013-04-111-0/+5
* NFC: pn533: Print out response status bits in hexWaldemar Rymarkiewicz2013-04-111-3/+4
* NFC: pn533: Reword all std frame logic functWaldemar Rymarkiewicz2013-04-111-60/+61
* NFC: pn533: Use dynamic debug for pn533 hex dumpsSamuel Ortiz2013-04-111-4/+4
* NFC: microread: Fix build failure due to a new MEI bus APISamuel Ortiz2013-04-011-21/+17
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-02-189-5/+1397
|\
| * NFC: microread: Fix mei physical layerSamuel Ortiz2013-02-111-19/+24
| * NFC: pn533: Fix target polling modeThierry Escande2013-02-081-1/+1
| * NFC: microread: Add MEI physical layerSamuel Ortiz2013-02-083-0/+254
| * NFC: microread: Add i2c physical layerSamuel Ortiz2013-02-033-0/+354
| * NFC: Initial support for Inside Secure microreadEric Lapuyade2013-02-036-0/+781
| * nfc: pn533: Remove unreachable codeWaldemar Rymarkiewicz2013-01-291-2/+0
| * nfc: pn533: Use static poll_mod and std_frame_opsWaldemar Rymarkiewicz2013-01-291-2/+2
* | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-01-288-840/+917
|\ \ | |/
OpenPOWER on IntegriCloud