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
..
wl12xx	wlcore/wl18xx/wl12xx: use u8 instead of bool for host_fast_wakeup_support	2012-06-08 09:14:08 +03:00
wl18xx	wl18xx: avoid some -Wformat warnings	2012-06-08 14:24:53 -04:00
wl1251	wl1251: Fix memory leaks in SPI initialization	2012-06-20 14:10:25 -04:00
wlcore	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-06-28 17:37:00 -07:00
Kconfig	wl18xx: add new module	2012-06-05 15:54:04 +03:00
Makefile	wl18xx: add new module	2012-06-05 15:54:04 +03:00