summaryrefslogtreecommitdiff
path: root/drivers/nfc (follow)
Commit message (Expand)AuthorAge
* Merge remote-tracking branch 'common/android-4.4-p' into lineage-18.1-caf-msm...Michael Bestas2021-12-27
|\
| * Merge 4.4.293 into android-4.4-pGreg Kroah-Hartman2021-11-26
| |\
| | * nfc: pn533: Fix double free when pn533_fill_fragment_skbs() failsChengfeng Ye2021-11-26
| * | Merge 4.4.291 into android-4.4-pGreg Kroah-Hartman2021-11-02
| |\|
| | * nfc: port100: fix using -ERRNO as command type maskKrzysztof Kozlowski2021-11-02
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2021-05-31
|\| |
| * | Merge 4.4.269 into android-4.4-pGreg Kroah-Hartman2021-05-22
| |\|
| | * nfc: pn533: prevent potential memory corruptionDan Carpenter2021-05-22
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-12-30
|\| |
| * | Merge 4.4.249 into android-4.4-pGreg Kroah-Hartman2020-12-29
| |\|
| | * nfc: s3fwrn5: Release the nfc firmwareBongsu Jeon2020-12-29
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-12-09
|\| |
| * | Merge 4.4.247 into android-4.4-pGreg Kroah-Hartman2020-12-02
| |\|
| | * nfc: s3fwrn5: use signed integer for parsing GPIO numbersKrzysztof Kozlowski2020-12-02
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-08-23
|\| |
| * | Merge 4.4.233 into android-4.4-pGreg Kroah-Hartman2020-08-21
| |\|
| | * nfc: s3fwrn5: add missing release on skb in s3fwrn5_recv_frameNavid Emamdoost2020-08-21
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-07-24
|\| |
| * | Merge 4.4.227 into android-4.4-pGreg Kroah-Hartman2020-06-11
| |\|
| | * NFC: st21nfca: add missed kfree_skb() in an error pathChuhong Yuan2020-06-11
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-04-14
|\| |
| * | Merge 4.4.218 into android-4.4-pGreg Kroah-Hartman2020-04-02
| |\|
| | * NFC: fdp: Fix a signedness bug in fdp_nci_send_patch()Dan Carpenter2020-04-02
| * | Merge 4.4.216 into android-4.4-pGreg Kroah-Hartman2020-03-11
| |\|
| | * nfc: pn544: Fix occasional HW initialization failureDmitry Osipenko2020-03-11
* | | Merge branch 'android-4.4-p' of https://android.googlesource.com/kernel/commo...Michael Bestas2020-03-08
|\| |
| * | Merge 4.4.215 into android-4.4-pGreg Kroah-Hartman2020-02-28
| |\|
| | * NFC: port100: Convert cpu_to_le16(le16_to_cpu(E1) + E2) to use le16_add_cpu().Mao Wenan2020-02-28
| * | Merge 4.4.214 into android-4.4-pGreg Kroah-Hartman2020-02-17
| |\|
| | * NFC: pn544: Adjust indentation in pn544_hci_check_presenceNathan Chancellor2020-02-14
| * | Merge 4.4.207 into android-4.4-pGreg Kroah-Hartman2019-12-21
| |\|
| | * NFC: nxp-nci: Fix NULL pointer dereference after I2C communication errorStephan Gerhold2019-12-21
* | | Merge android-4.4-p.201 (ef0b39d) into msm-4.4Srinivasarao P2019-11-20
|\| |
| * | Merge 4.4.201 into android-4.4-pGreg Kroah-Hartman2019-11-14
| |\|
| | * NFC: st21nfca: fix double freePan Bian2019-11-12
| | * NFC: fdp: fix incorrect free objectPan Bian2019-11-12
| * | Merge 4.4.191 into android-4.4-pGreg Kroah-Hartman2019-09-06
| |\|
| * | Merge 4.4.175 into android-4.4-pGreg Kroah-Hartman2019-02-20
| |\ \
| * \ \ Merge 4.4.166 into android-4.4-pGreg Kroah-Hartman2018-12-01
| |\ \ \
* | \ \ \ Merge android-4.4.191 (6da3fbc) into msm-4.4Srinivasarao P2019-09-09
|\ \ \ \ \
| * \ \ \ \ Merge 4.4.191 into android-4.4Greg Kroah-Hartman2019-09-06
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | st_nci_hci_connectivity_event_received: null check the allocationNavid Emamdoost2019-09-06
| | * | | | st21nfca_connectivity_event_received: null check the allocationNavid Emamdoost2019-09-06
| | | |_|/ | | |/| |
* | | | | Merge android-4.4.175 (08d5867) into msm-4.4Srinivasarao P2019-02-22
|\| | | |
| * | | | Merge 4.4.175 into android-4.4Greg Kroah-Hartman2019-02-20
| |\| | |
| | * | | NFC: nxp-nci: Include unaligned.h instead of access_ok.hGuenter Roeck2019-02-20
| | | |/ | | |/|
* | | | Merge android-4.4.166 (4c4bedf) into msm-4.4Srinivasarao P2018-12-03
|\| | |
| * | | Merge 4.4.166 into android-4.4Greg Kroah-Hartman2018-12-01
| |\| | | | |/ | |/|
| | * NFC: nfcmrvl_uart: fix OF child-node lookupJohan Hovold2018-12-01
* | | Merge android-4.4.127 (d6bbe8b) into msm-4.4Srinivasarao P2018-04-20
|\| |