linux/drivers/nfc/pn533
Jakub Kicinski 61eb236c41 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Merge in late fixes in preparation for the net-next PR.

Conflicts:

drivers/dpll/dpll_core.c
drivers/dpll/dpll_netlink.c
  33f016b23a ("dpll: fix NULL deref in dpll_device_ops() during teardown race")
  b1d0c41208 ("dpll: add STATE_CONNECTED_OVERRIDE pin capability")
https://lore.kernel.org/aoR9YYY2P5--3x0N@sirena.org.uk
https://lore.kernel.org/aoR9VmKllVGwmQn_@sirena.org.uk

No adjacent changes.

Signed-off-by: Jakub Kicinski <kuba@kernel.org>
2026-08-18 10:42:41 -07:00
..
i2c.c nfc: Unify style of of_device_id arrays 2026-08-11 18:14:00 +02:00
Kconfig treewide: replace '---help---' in Kconfig files with 'help' 2020-06-14 01:57:21 +09:00
Makefile nfc: pn533: add UART phy driver 2019-10-29 21:05:26 -07:00
pn533.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net 2026-08-18 10:42:41 -07:00
pn533.h nfc: pn533: Constify pn533_phy_ops 2021-10-07 13:35:10 +01:00
uart.c nfc: Unify style of of_device_id arrays 2026-08-11 18:14:00 +02:00
usb.c nfc: pn533: refactor endpoint lookup 2026-03-31 19:24:30 -07:00