kevin/linux
1
Fork 0
Code
b91867f2ee
linux/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
..
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
drv_types.h Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08:00
ethernet.h
generic.h
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
ip.h
Kconfig staging: r8712u: Add missing initialization and remove configuration parameter CONFIG_R8712_AP 2012-02-10 09:57:28 -08:00
little_endian.h
Makefile
mlme_linux.c
mlme_osdep.h
mp_custom_oid.h
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
rtl871x_byteorder.h
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
rtl871x_event.h
rtl871x_ht.h
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_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
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_ioctl.h
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_ioctl.c
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
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_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
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
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
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
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
rtl8712_cmdctrl_regdef.h
rtl8712_debugctrl_bitdef.h
rtl8712_debugctrl_regdef.h
rtl8712_edcasetting_bitdef.h
rtl8712_edcasetting_regdef.h
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
rtl8712_fifoctrl_regdef.h
rtl8712_gp_bitdef.h
rtl8712_gp_regdef.h
rtl8712_hal.h staging: r8712u: Use asynchronous firmware loading 2012-02-08 14:14:15 -08:00
rtl8712_interrupt_bitdef.h
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
rtl8712_macsetting_regdef.h
rtl8712_powersave_bitdef.h
rtl8712_powersave_regdef.h
rtl8712_ratectrl_bitdef.h
rtl8712_ratectrl_regdef.h
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
rtl8712_security_bitdef.h
rtl8712_spec.h
rtl8712_syscfg_bitdef.h
rtl8712_syscfg_regdef.h
rtl8712_timectrl_bitdef.h
rtl8712_timectrl_regdef.h
rtl8712_wmac_bitdef.h
rtl8712_wmac_regdef.h
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
TODO
usb_halinit.c
usb_intf.c Merge tag 'staging-3.3-rc3' into staging-next 2012-02-10 10:58:25 -08: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_ops.c
usb_ops.h
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
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