David S. Miller ff24e4980a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Three trivial overlapping conflicts.

Signed-off-by: David S. Miller <davem@davemloft.net>

2019-05-02 22:14:21 -04:00

..

adf7242.c

net: ieee802154: fix a potential NULL pointer dereference

2019-03-13 10:07:53 +01:00

at86rf230.c

ieee802154: at86rf230: convert to DEFINE_SHOW_ATTRIBUTE

2018-12-10 12:05:20 -08:00

at86rf230.h

at86rf230: add debugfs support

2015-09-17 13:20:05 +02:00

atusb.c

net: ieee802154: atusb: Replace GFP_ATOMIC with GFP_KERNEL in atusb_probe

2018-04-23 20:56:23 +02:00

atusb.h

ieee802154: atusb: Driver for Busware HUL dongle

2017-09-20 13:37:16 +02:00

ca8210.c

ieee802154: ca8210: fix possible u8 overflow in ca8210_rx_done

2018-12-11 09:33:11 +01:00

cc2520.c

ieee802154: cc2520: switch from BUG_ON() to WARN_ON() on problem

2017-11-06 16:27:55 +01:00

fakelb.c

ieee802154: fakelb: add deprecated msg while probe

2018-08-06 11:21:15 +02:00

Kconfig

ieee802154: hwsim: add replacement for fakelb

2018-08-06 11:21:15 +02:00

mac802154_hwsim.c

genetlink: optionally validate strictly/dumps

2019-04-27 17:07:22 -04:00

mac802154_hwsim.h

ieee802154: hwsim: add replacement for fakelb

2018-08-06 11:21:15 +02:00

Makefile

ieee802154: hwsim: add replacement for fakelb

2018-08-06 11:21:15 +02:00

mcr20a.c

net: ieee802154: fix missing checks for regmap_update_bits

2019-04-24 20:15:15 +02:00

mcr20a.h

ieee802154: Add NXP MCR20A IEEE 802.15.4 transceiver driver

2018-02-21 09:08:39 +01:00

mrf24j40.c

ieee802154: mrf24j40: fix incorrect mask in mrf24j40_stop

2017-11-06 16:27:55 +01:00