diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-08-15 15:55:10 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-08-15 15:55:10 -0400 |
| commit | 74ea1f45243ecfbed30e3ef51d9ec5df2042be03 (patch) | |
| tree | 60b7b368d95477b2a1711cee36e7d6eda3797b04 /drivers/net | |
| parent | 946951e1419279b7eded84b84da0de7381ee6663 (diff) | |
| parent | 39525ee1dc78ca1f5f2fb1f764f7a141005fe440 (diff) | |
Merge tag 'nfc-next-3.12-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz <sameo@linux.intel.com> says:
"This is the first NFC pull request for the 3.12 release.
With this one we have:
- A few pn533 improvements and minor fixes. Testing our pn533 driver
against Google's NCI stack triggered a few issues that we fixed now.
We also added Tx fragmentation support to this driver.
- More NFC secure element handling. We added a GET_SE netlink command
for getting all the discovered secure elements, and we defined 2
additional secure element netlink event (transaction and connectivity).
We also fixed a couple of typos and copy-paste bugs from the secure
element handling code.
- Firmware download support for the pn544 driver. This chipset can enter a
special mode where it's waiting for firmware blobs to replace the
already flashed one. We now support that mode."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions