q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/wireless/rtlwifi
History
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
..
rtl8192c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
rtl8192ce wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
rtl8192cu Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-06-28 17:37:00 -07:00
rtl8192de wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
rtl8192se wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
Kconfig rtlwifi: Fix breakage in debug functions when built as a module 2012-02-27 14:05:45 -05:00
Makefile rtlwifi: rtl8192de: Modify Kconfig and Makefile routines for new driver 2011-06-27 15:09:38 -04:00
base.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
base.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
cam.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
cam.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
core.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
core.h rtlwifi: Convert to asynchronous firmware load 2012-01-30 15:48:50 -05:00
debug.c rtlwifi: Move pr_fmt macros to a single location 2012-01-30 15:48:23 -05:00
debug.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
efuse.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
efuse.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
pci.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
pci.h rtlwifi: Convert to asynchronous firmware load 2012-01-30 15:48:50 -05:00
ps.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
ps.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
rc.c mac80211: remove channel type argument from rate_update 2012-04-10 14:54:08 -04:00
rc.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
regd.c rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
regd.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
usb.c rtlwifi: fix for race condition when firmware is cached 2012-05-14 13:51:24 -04:00
usb.h rtlwifi: Move pr_fmt macros to a single location 2012-01-30 15:48:23 -05:00
wifi.h rtlwifi: Add dm structs to private structure 2012-04-23 15:35:32 -04:00