path: root/net/ipv4/ip_tunnel_core.c
diff options
authorDavid S. Miller <davem@davemloft.net>2015-08-23 20:42:57 -0700
committerDavid S. Miller <davem@davemloft.net>2015-08-23 20:42:57 -0700
commitd9893d1351e11f565940df6cd6f9bf13aac27a3a (patch)
treedfe753af88000e38fac4c3e59b5d39dd32338feb /net/ipv4/ip_tunnel_core.c
parentroute: fix breakage after moving lwtunnel state (diff)
parentnfc: netlink: Add capability to reply to vendor_cmd with data (diff)
Merge tag 'nfc-next-4.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/nfc-next
Samuel Ortiz says: ==================== NFC 4.3 pull request This is the NFC pull request for 4.3. With this one we have: - A new driver for Samsung's S3FWRN5 NFC chipset. In order to properly support this driver, a few NCI core routines needed to be exported. Future drivers like Intel's Fields Peak will benefit from this. - SPI support as a physical transport for STM st21nfcb. - An additional netlink API for sending replies back to userspace from vendor commands. - 2 small fixes for TI's trf7970a - A few st-nci fixes. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/ip_tunnel_core.c')
0 files changed, 0 insertions, 0 deletions