2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-24 21:24:00 +08:00
linux-next/net/mac802154
David S. Miller b26d344c6b Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/caif/caif_hsi.c
	drivers/net/usb/qmi_wwan.c

The qmi_wwan merge was trivial.

The caif_hsi.c, on the other hand, was not.  It's a conflict between
1c385f1fdf ("caif-hsi: Replace platform
device with ops structure.") in the net-next tree and commit
39abbaef19 ("caif-hsi: Postpone init of
HIS until open()") in the net tree.

I did my best with that one and will ask Sjur to check it out.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-06-28 17:37:00 -07:00
..
ieee802154_dev.c mac802154: add wpan device-class support 2012-06-26 21:06:11 -07:00
Kconfig mac802154: allocation of ieee802154 device 2012-05-16 15:16:35 -04:00
mac802154.h mac802154: page and channel setter 2012-06-26 21:06:11 -07:00
mac_cmd.c mac802154: mlme start request 2012-06-26 21:06:11 -07:00
Makefile mac802154: add wpan device-class support 2012-06-26 21:06:11 -07:00
mib.c mac802154: page and channel setter 2012-06-26 21:06:11 -07:00
monitor.c mac802154: monitor device support 2012-05-16 15:17:08 -04:00
rx.c mac802154: add wpan device-class support 2012-06-26 21:06:11 -07:00
tx.c Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
wpan.c mac802154: add wpan device-class support 2012-06-26 21:06:11 -07:00