diff options
| author | John W. Linville <linville@tuxdriver.com> | 2013-01-15 00:08:52 +0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2013-01-15 00:08:52 +0400 |
| commit | 50c2f5e8f93c83ddb7fe74057db1e3030724ae6e (patch) | |
| tree | 6c7f16224195283a6bbe334e19fd1e14a6aad8e6 /drivers/hid/hid-roccat-kovaplus.c | |
| parent | 990debe2ca8379863709721926550a55f47f3880 (diff) | |
| parent | d3710e74cf329839dea8d13b1ad56e572b06b173 (diff) | |
| download | linux-50c2f5e8f93c83ddb7fe74057db1e3030724ae6e.tar.xz | |
Merge tag 'nfc-next-3.9-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 patchset targeted at the 3.9 merge window.
It brings the following goodies:
- LLCP socket timestamping (To be used e.g with the recently released nfctool
application for a more efficient skb timestamping when sniffing).
- A pretty big pn533 rework from Waldemar, preparing the driver to support
more flavours of pn533 based devices.
- HCI changes from Eric in preparation for the microread driver support.
- Some LLCP memory leak fixes, cleanups and slight improvements.
- pn544 and nfcwilink move to the devm_kzalloc API.
- An initial Secure Element (SE) API.
- An nfc.h license change from the original author, allowing non GPL
application code to safely include it."
Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/hid/hid-roccat-kovaplus.c')
0 files changed, 0 insertions, 0 deletions