1
0
Fork 0
alistair23-linux/drivers/net/ieee802154
David S. Miller 2be09de7d6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Lots of conflicts, by happily all cases of overlapping
changes, parallel adds, things of that nature.

Thanks to Stephen Rothwell, Saeed Mahameed, and others
for their guidance in these resolutions.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-12-20 11:53:36 -08:00
..
Kconfig 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
adf7242.c ieee802154: remove unecessary condition check before debugfs_remove_recursive 2018-09-21 14:53:04 +02: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
mac802154_hwsim.c ieee802154: hwsim: fix off-by-one in parse nested 2018-12-02 11:08:46 +01:00
mac802154_hwsim.h ieee802154: hwsim: add replacement for fakelb 2018-08-06 11:21:15 +02:00
mcr20a.c Merge branch 'ieee802154-for-davem-2018-10-04' of git://git.kernel.org/pub/scm/linux/kernel/git/sschmidt/wpan-next 2018-10-04 09:32:48 -07: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