summaryrefslogtreecommitdiff
path: root/crypto/tea.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2013-10-18 13:59:28 -0400
committerJohn W. Linville <linville@tuxdriver.com>2013-10-18 13:59:28 -0400
commitdf3c2adea4e432a2ca8fc0aed1caa7c7a7d84086 (patch)
treef0604dbb1efda5772886cbbae88dc7b8cb88d617 /crypto/tea.c
parent444474dd5b33332100311af8ff31a587f6105011 (diff)
parentddc1a70b5f2a07a932ed31f989d63937bb813439 (diff)
Merge tag 'nfc-next-3.13-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.13 kernel. It's a fairly big one, with the following highlights: - NFC digital layer implementation: Most NFC chipsets implement the NFC digital layer in firmware, but others have more basic functionalities and expect the host to implement the digital layer. This layer sits below the NFC core. - Sony's port100 support: This is "soft" NFC USB dongle that expects the digital layer to be implemented on the host. This is the first user of our NFC digital stack implementation. - Secure element API: We now provide a netlink API for enabling, disabling and discovering NFC attached (embedded or UICC ones) secure elements. With some userspace help, this allows us to support NFC payments. Only the pn544 driver currently supports that API. - NCI SPI fixes and improvements: In order to support NCI devices over SPI, we fixed and improved our NCI/SPI implementation. The currently most deployed NFC NCI chipset, Broadcom's bcm2079x, supports that mode and we're planning to use our NCI/SPI framework to implement a driver for it. - pn533 fragmentation support in target mode: This was the only missing feature from our pn533 impementation. We now support fragmentation in both Tx and Rx modes, in target mode." Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'crypto/tea.c')
0 files changed, 0 insertions, 0 deletions