diff options
| author | David S. Miller <davem@davemloft.net> | 2016-03-13 22:43:01 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2016-03-13 22:43:01 -0400 |
| commit | f4fa6e6d883cd89fa5c240c1896a4dd329d1caa9 (patch) | |
| tree | 0e406e300f1e71ecc735010dda8d875db98540bf /MAINTAINERS | |
| parent | 010998815230792aa8923a4b72deef0fd0c5f2e5 (diff) | |
| parent | 079c2652e5af648db6bf4f54bcafdafcc57a0d2c (diff) | |
| download | linux-f4fa6e6d883cd89fa5c240c1896a4dd329d1caa9.tar.bz2 | |
Merge tag 'nfc-next-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says:
====================
NFC 4.6 pull request
This is a very small one this time, with only 5 patches.
There are a couple of big items that could not be merged/finished
on time.
We have:
- 2 LLCP fixes for a race and a potential OOM.
- 2 cleanups for the pn544 and microread drivers.
- 1 Maintainer addition for the s3fwrn5 driver.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 1663ad41803c..b70294ea7d63 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7666,7 +7666,6 @@ F: net/nfc/ F: include/net/nfc/ F: include/uapi/linux/nfc.h F: drivers/nfc/ -F: include/linux/platform_data/microread.h F: include/linux/platform_data/nfcmrvl.h F: include/linux/platform_data/nxp-nci.h F: include/linux/platform_data/pn544.h @@ -9509,6 +9508,7 @@ F: drivers/media/i2c/s5k5baf.c SAMSUNG S3FWRN5 NFC DRIVER M: Robert Baldyga <r.baldyga@samsung.com> +M: Krzysztof Opasiak <k.opasiak@samsung.com> L: linux-nfc@lists.01.org (moderated for non-subscribers) S: Supported F: drivers/nfc/s3fwrn5 |