summaryrefslogtreecommitdiffstats
path: root/drivers/nfc
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ | |/
| * NFC: pn533: Fix bad allocation sizeThierry Escande2013-01-131-2/+2
| * NFC: pn533: Fix missing parenthesisWaldemar Rymarkiewicz2013-01-101-1/+2
| * NFC: Initial Secure Element APISamuel Ortiz2013-01-103-2/+6
| * NFC: pn544: Use devm_kzalloc APISamuel Ortiz2013-01-101-14/+6
| * NFC: pn544: Use module_i2c_driverSamuel Ortiz2013-01-101-23/+1
| * NFC: pn544: Separate the core code and the i2c one into different modulesSamuel Ortiz2013-01-105-16/+35
| * NFC: Add HCI quirks to support driver (non)standard implementationsEric Lapuyade2013-01-101-1/+1
| * NFC: Fixed skb leak in tm_send() nfc and hci ops implementationsEric Lapuyade2013-01-101-2/+8
| * NFC: Changed event_received hci ops result semanticEric Lapuyade2013-01-101-5/+11
| * NFC: Added error handling in event_received hci opsEric Lapuyade2013-01-101-14/+13
| * NFC: nfcwilink: Use devm_kzallocJulia Lawall2013-01-101-7/+2
| * NFC: pn533: Introduce ops for frame logicWaldemar Rymarkiewicz2013-01-101-73/+135
| * NFC: pn533: Remove unused dev->wq_in_frameWaldemar Rymarkiewicz2013-01-101-5/+0
| * NFC: pn533: Cleanup pn533_cmd_complete_tWaldemar Rymarkiewicz2013-01-101-22/+7
| * NFC: pn533: Remove deprecated dev->out_frame buffWaldemar Rymarkiewicz2013-01-101-6/+1
| * NFC: pn533: Use skb in __pn533_send_cmd_frame_asynWaldemar Rymarkiewicz2013-01-101-26/+18
| * NFC: pn533: Don't use out_frame in pn533_send_ackWaldemar Rymarkiewicz2013-01-101-25/+6
| * NFC: pn533: Cleanup debug messagesWaldemar Rymarkiewicz2013-01-101-25/+7
| * NFC: pn533: Fix urb->status handlingWaldemar Rymarkiewicz2013-01-101-16/+18
| * NFC: pn533: Remove unused pn533_send_cmd_frame_asyWaldemar Rymarkiewicz2013-01-101-68/+7
| * NFC: pn533: Fix minor style issuesWaldemar Rymarkiewicz2013-01-101-5/+5
| * NFC: pn533: Fix open parenthesis alignmentWaldemar Rymarkiewicz2013-01-101-22/+19
| * NFC: pn533: Fix spacing issuesWaldemar Rymarkiewicz2013-01-101-8/+8
| * NFC: pn533: Fix quoted strings split across linesWaldemar Rymarkiewicz2013-01-101-35/+35
| * NFC: pn533: Remove frame logic from poll cmdsWaldemar Rymarkiewicz2013-01-101-144/+126
| * NFC: pn533: Dump tx and rx data in debug modeWaldemar Rymarkiewicz2013-01-101-0/+6
| * NFC: pn533: Del frame logic from Data Exchange cmdWaldemar Rymarkiewicz2013-01-101-168/+141
| * NFC: pn533: Del frame logic from InJumForDep cmdWaldemar Rymarkiewicz2013-01-101-62/+55
| * NFC: pn533: Del frame logic from TgGet/SetData cmdWaldemar Rymarkiewicz2013-01-101-64/+33
| * NFC: pn533: Remove pn533_send_cmd_frame_syncWaldemar Rymarkiewicz2013-01-101-112/+85
| * NFC: pn533: Add pn533_alloc_skb for req allocationWaldemar Rymarkiewicz2013-01-101-6/+16
| * NFC: pn533: Add a new pn533_send_sync ifaceWaldemar Rymarkiewicz2013-01-101-1/+54
| * NFC: pn533: Add a new pn533_send_data_async ifaceWaldemar Rymarkiewicz2013-01-101-0/+31
| * NFC: pn533: Add a new pn533_send_cmd_async ifaceWaldemar Rymarkiewicz2013-01-101-3/+164
| * NFC: pn533: Remove pointless flags paramWaldemar Rymarkiewicz2013-01-101-19/+14
| * NFC: pn533: Add frame header length defineWaldemar Rymarkiewicz2013-01-101-20/+33
| * NFC: pn533: Remove unused definitionsWaldemar Rymarkiewicz2013-01-101-8/+0
| * NFC: pn533: Remove in/out_maxlen as it is not usedWaldemar Rymarkiewicz2013-01-101-20/+16
* | Drivers: misc: remove __dev* attributes.Greg Kroah-Hartman2013-01-031-4/+4
|/
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-211-11/+14
|\
| * NFC: Fix pn533 target mode memory leakThierry Escande2012-11-201-1/+5
OpenPOWER on IntegriCloud