summaryrefslogtreecommitdiffstats
path: root/drivers/net
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2014-01-13 14:36:42 -0500
committerJohn W. Linville <linville@tuxdriver.com>2014-01-13 14:36:42 -0500
commitec665facde820179d71d0f064e692f449df2b94f (patch)
tree68725bffefc5c304756e7949dbdb09078790b5b3 /drivers/net
parent1e2f9295f4c657500111514f92a3d3894d0e05b4 (diff)
parentbb55dc2ae4367b8f711d43a2f8668a6ed42c4fd3 (diff)
Merge tag 'nfc-next-3.14-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 3.14 It includes: * A new NFC driver for Marvell's 8897, and a few NCI fixes and improvements needed to support this chipset. * An LLCP fix for how we were setting the default MIU on a p2p link. If there is no explicit MIU extension announced at connection time, we must use the default one and not the one announced at LLCP link establishement time. * A pn544 EEPROM config update. Some of the currently EEPROM configured values are overwriting the firmware ones while other should not be set by the driver itself. * Some NFC digital stack fixes and improvements. Asynchronous functions are better documented, RF technologies and CRC functions are set upon PSL_REQ reception, and a few minor bugs are fixed. * Minor and miscelaneous pn533, mei_phy and port100 fixes." Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net')
0 files changed, 0 insertions, 0 deletions