Merge tag 'nfc-next-4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo...
authorDavid S. Miller <davem@davemloft.net>
Mon, 14 Mar 2016 02:43:01 +0000 (22:43 -0400)
committerDavid S. Miller <davem@davemloft.net>
Mon, 14 Mar 2016 02:43:01 +0000 (22:43 -0400)
commitf4fa6e6d883cd89fa5c240c1896a4dd329d1caa9
tree0e406e300f1e71ecc735010dda8d875db98540bf
parent010998815230792aa8923a4b72deef0fd0c5f2e5
parent079c2652e5af648db6bf4f54bcafdafcc57a0d2c
Merge tag 'nfc-next-4.6-1' of git://git./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>
MAINTAINERS