UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/staging/rtl8712
History
Greg Kroah-Hartman b91867f2ee Merge tag 'staging-3.3-rc3' into staging-next 
This was done to resolve some merge issues with the following files that
had changed in both branches:
	drivers/staging/rtl8712/rtl871x_sta_mgt.c
	drivers/staging/tidspbridge/rmgr/drv_interface.c
	drivers/staging/zcache/zcache-main.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 		2012-02-10 10:58:25 -08:00
..
Kconfig staging: r8712u: Add missing initialization and remove configuration parameter CONFIG_R8712_AP 2012-02-10 09:57:28 -08:00
Makefile Staging: rtl8712: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
TODO staging: r8712u: Switch driver to use external firmware from linux-firmware 2011-01-21 12:23:30 -08:00
basic_types.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
big_endian.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
drv_types.h Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
ethernet.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
generic.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
hal_init.c staging: r8712u: Use asynchronous firmware loading 2012-02-08 14:14:15 -08:00
ieee80211.c staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
ieee80211.h staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
if_ether.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
ip.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
little_endian.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
mlme_linux.c
…
mlme_osdep.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
mp_custom_oid.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
os_intfs.c Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
osdep_intf.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
osdep_service.h staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
recv_linux.c staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives. 2011-09-06 17:00:32 -07:00
recv_osdep.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl871x_byteorder.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl871x_cmd.c staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
rtl871x_cmd.h staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
rtl871x_debug.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
rtl871x_eeprom.c
…
rtl871x_eeprom.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl871x_event.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl871x_ht.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl871x_io.c staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_io.h staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_ioctl.h
…
rtl871x_ioctl_linux.c staging: r8712u: Most return-values changed from -1 to proper errno macros. 2011-09-06 17:00:36 -07:00
rtl871x_ioctl_rtl.c staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_ioctl_rtl.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
rtl871x_ioctl_set.c staging: r8712u: Most return-values changed from -1 to proper errno macros. 2011-09-06 17:00:36 -07:00
rtl871x_ioctl_set.h staging: r8712u: Most return-values changed from -1 to proper errno macros. 2011-09-06 17:00:36 -07:00
rtl871x_led.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
rtl871x_mlme.c drivers/staging/rtl8712/rtl871x_mlme.c: eliminate a null pointer dereference 2011-11-26 17:19:23 -08:00
rtl871x_mlme.h staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
rtl871x_mp.c staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
rtl871x_mp.h staging: r8712u: Merging Realtek's latest (v2.6.6). Removed redundant .mem. 2011-09-06 17:00:32 -07:00
rtl871x_mp_ioctl.c staging: r8712u: Fix sparse message 2011-01-21 12:22:19 -08:00
rtl871x_mp_ioctl.h staging: r8712u: Merging Realtek's latest (v2.6.6). No power tracking OID. 2011-09-06 17:00:33 -07:00
rtl871x_mp_phy_regdef.h Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl871x_pwrctrl.c staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_pwrctrl.h staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_recv.c staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_recv.h staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_rf.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl871x_security.c staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives. 2011-09-06 17:00:32 -07:00
rtl871x_security.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl871x_sta_mgt.c staging: r8712u: Add missing initialization and remove configuration parameter CONFIG_R8712_AP 2012-02-10 09:57:28 -08:00
rtl871x_wlan_sme.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl871x_xmit.c staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl871x_xmit.h staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl8712_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_cmd.c staging: r8712u: Merging Realtek's latest (v2.6.6). Updated include directives. 2011-09-06 17:00:32 -07:00
rtl8712_cmd.h staging: r8712u: Merging Realtek's latest (v2.6.6). New decl's and defines. 2011-09-06 17:00:35 -07:00
rtl8712_cmdctrl_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_cmdctrl_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_debugctrl_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_debugctrl_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_edcasetting_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_edcasetting_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_efuse.c staging: r8712u: Merging Realtek's latest (v2.6.6). Rework efuse data handling. 2011-09-06 17:00:34 -07:00
rtl8712_efuse.h
…
rtl8712_event.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
rtl8712_fifoctrl_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_fifoctrl_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_gp_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_gp_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_hal.h staging: r8712u: Use asynchronous firmware loading 2012-02-08 14:14:15 -08:00
rtl8712_interrupt_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_io.c
…
rtl8712_led.c staging: r8712u: Merging Realtek's latest (v2.6.6). Redundant NULL check. 2011-09-06 17:00:31 -07:00
rtl8712_macsetting_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_macsetting_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_powersave_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_powersave_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_ratectrl_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_ratectrl_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_recv.c staging: r8712u: Simplify semaphores 2012-02-09 09:12:55 -08:00
rtl8712_recv.h staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
rtl8712_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_security_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_spec.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_syscfg_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_syscfg_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_timectrl_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_timectrl_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added copyright banners. 2011-08-23 12:53:52 -07:00
rtl8712_wmac_bitdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_wmac_regdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
rtl8712_xmit.c staging: r8712u: Merging Realtek's latest (v2.6.6). Tx aggregation. 2011-09-06 17:00:35 -07:00
rtl8712_xmit.h staging: r8712u: Merging Realtek's latest (v2.6.6). Tx aggregation. 2011-09-06 17:00:35 -07:00
sta_info.h staging: r8712u: Add missing initialization and remove configuration parameter CONFIG_R8712_AP 2012-02-10 09:57:28 -08:00
swab.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
usb_halinit.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usb_intf.c Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
usb_ops.c
…
usb_ops.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
usb_ops_linux.c staging: r8712u: Merging Realtek's latest (v2.6.6). Various fixes. 2011-09-06 17:00:35 -07:00
usb_osintf.h staging: r8712u: Merging Realtek's latest (v2.6.6). stop_drv_timers moved. 2011-09-06 17:00:33 -07:00
usb_vendor_req.h staging: r8712u: Merging Realtek's latest (v2.6.6). Added Larry's copyright. 2011-08-23 12:53:52 -07:00
wifi.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
wlan_bssdef.h staging: r8712u: Merging Realtek's latest (v2.6.6). Copyright banners. 2011-09-06 17:00:29 -07:00
xmit_linux.c staging: r8712u: Merging Realtek's latest (v2.6.6). tx: NULL _in_ spin lock. 2011-09-06 17:00:34 -07:00
xmit_osdep.h staging: r8712u: Merging Realtek's latest (v2.6.6). tx: NULL _in_ spin lock. 2011-09-06 17:00:34 -07:00