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
..
gdm_qos.c
gdm_qos.h
gdm_sdio.c	staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices	2012-05-17 13:17:41 -07:00
gdm_sdio.h
gdm_usb.c	staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices	2012-05-17 13:17:41 -07:00
gdm_usb.h
gdm_wimax.c	staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices	2012-05-17 13:17:41 -07:00
gdm_wimax.h	staging: gdm72xx: Set up parent link in sysfs for gdm72xx devices	2012-05-17 13:17:41 -07:00
hci.h
Kconfig	staging: gdm72xx depends on NET	2012-05-17 13:17:41 -07:00
Makefile
netlink_k.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
netlink_k.h
sdio_boot.c
sdio_boot.h
TODO
usb_boot.c
usb_boot.h
usb_ids.h
wm_ioctl.h