summaryrefslogtreecommitdiff
path: root/net/nfc/nci/lib.c
diff options
context:
space:
mode:
authorFlorian Fainelli <f.fainelli@gmail.com>2017-02-06 13:01:16 -0800
committerDavid S. Miller <davem@davemloft.net>2017-02-07 13:03:10 -0500
commitb08d46b01e995dd7b653b22d35bd1d958d6ee9b4 (patch)
treed62db18848a1d901434f01223cd9bcca6683ceab /net/nfc/nci/lib.c
parent8d1fb01df8f64af14c833805dcbd05bf4582e028 (diff)
net: phy: bcm7xxx: Add BCM74371 PHY ID
Add the BCM74371 PHY ID to the list of supported chips. This is a 28nm technology Gigabit PHY SoC. Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/nfc/nci/lib.c')
0 files changed, 0 insertions, 0 deletions
v class='commit-subject'>Merge tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux
Pull RTC fix from Alexandre Belloni: "A single fix for this cycle. It is worth taking it for 4.10 so that distributions will not have CONFIG_RTC_DRV_JZ4740 switching from m to y in their config. Summary: - Allow jz4740 to build as a module again by using kernel_halt()" * tag 'rtc-4.10-2' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: rtc: jz4740: make the driver buildable as a module again
Diffstat (limited to 'net/l2tp/l2tp_ppp.c')