openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/staging/rtl8712
History
Linus Torvalds 1380516599 Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: (741 commits)
  staging:iio:meter:ade7753 should be 16 bit read not 8 bit for mode register.
  staging:iio:kfifo_buf fix double initialization of the ring device structure.
  staging:iio:accel:lis3l02dq: fix incorrect pointer passed to spi_set_drvdata.
  staging:iio:imu fix missing register table index for some channels
  spectra: enable device before poking it
  staging: rts_pstor: Fix a miswriting
  staging/lirc_bt829: Return -ENODEV when no hardware is found.
  staging/lirc_parallel: remove pointless prototypes.
  staging/lirc_parallel: fix panic on rmmod
  staging:iio:adc:ad7476: Incorrect pointer into spi_set_drvdata.
  Staging: zram: Fix kunmapping order
  Revert "gma500: Fix dependencies"
  gma500: Add medfield header
  gma500: wire up the mrst i2c bus from chip_info
  gma500: Fix DPU build
  gma500: Clean up the DPU config and make it runtime
  gma500: resync with Medfield progress
  gma500: Use the mrst helpers and power control for mode commit
  gma500@ Fix backlight range error
  gma500: More Moorestown muddle meddling means MM maybe might modeset
  ...

Fix up fairly trivial conflicts all over, mostly due to header file
cleanup conflicts, but some deleted files and some just context changes:
 - Documentation/feature-removal-schedule.txt
 - drivers/staging/bcm/headers.h
 - drivers/staging/brcm80211/brcmfmac/dhd_linux.c
 - drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
 - drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
 - drivers/staging/brcm80211/brcmfmac/wl_iw.c
 - drivers/staging/et131x/et131x_netdev.c
 - drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
 - drivers/staging/rtl8192e/r8192E.h
 - drivers/staging/usbip/userspace/src/utils.h
 		2011-07-25 23:26:34 -07:00
..
Kconfig staging: r8712u: Firmware changes for driver 2011-01-21 12:23:55 -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: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
big_endian.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
drv_types.h treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
ethernet.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
generic.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
hal_init.c Staging: Merge branch 'staging-next' into 2.6.38-rc3 2011-02-02 13:35:58 -08:00
ieee80211.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
ieee80211.h staging: rtl8712: Use __packed instead of __attribute__ ((packed)) 2011-07-05 10:23:57 -07:00
if_ether.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
ip.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
little_endian.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
mlme_linux.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
mlme_osdep.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
mp_custom_oid.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
os_intfs.c staging: r8712u: Add module parameter to disable turbo mode 2010-08-31 10:59:52 -07:00
osdep_intf.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
osdep_service.h Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-07-25 23:26:34 -07:00
recv_linux.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
recv_osdep.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_byteorder.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_cmd.c staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_cmd.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_debug.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_eeprom.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_eeprom.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_event.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_ht.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_io.c Staging: rtl8712: redundant null check before kfree() 2011-04-20 13:45:59 -07:00
rtl871x_io.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_ioctl.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_ioctl_linux.c staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -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: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_ioctl_set.c staging: r8712u: Fix driver to support ad-hoc mode 2011-05-03 10:57:39 -07:00
rtl871x_ioctl_set.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_led.h Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl871x_mlme.c Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl871x_mlme.h Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl871x_mp.c staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_mp.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_mp_ioctl.c staging: r8712u: Fix sparse message 2011-01-21 12:22:19 -08:00
rtl871x_mp_ioctl.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_mp_phy_regdef.h Fix common misspellings 2011-03-31 11:26:23 -03:00
rtl871x_pwrctrl.c staging: rtl8712: rtl871x_pwrctrl.c remove one to many l's in the word. 2011-02-28 18:24:48 -08:00
rtl871x_pwrctrl.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_recv.c staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_recv.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_rf.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_security.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_security.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl871x_sta_mgt.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_wlan_sme.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl871x_xmit.c Staging: rtl8712: redundant null check before kfree() 2011-04-20 13:45:59 -07:00
rtl871x_xmit.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl8712_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_cmd.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_cmd.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_cmdctrl_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_cmdctrl_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_debugctrl_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_debugctrl_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_edcasetting_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_edcasetting_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_efuse.c drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
rtl8712_efuse.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_event.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl8712_fifoctrl_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_fifoctrl_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_gp_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_gp_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_hal.h staging: rtl8712: Add missing whitespace in struct definition 2011-07-05 10:23:57 -07:00
rtl8712_interrupt_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_io.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_led.c staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl8712_macsetting_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_macsetting_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_powersave_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_powersave_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_ratectrl_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_ratectrl_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_recv.c staging: Remove unnecessary semicolons when while (foo) {...}; 2011-04-25 16:58:34 -07:00
rtl8712_recv.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
rtl8712_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_security_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_spec.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_syscfg_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_syscfg_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_timectrl_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_timectrl_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_wmac_bitdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_wmac_regdef.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
rtl8712_xmit.c drivers/staging: Remove unnecessary semicolons 2010-11-16 12:06:47 -08:00
rtl8712_xmit.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
sta_info.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
swab.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
usb_halinit.c Fix common misspellings 2011-03-31 11:26:23 -03:00
usb_intf.c staging: r8712u: Add new device IDs 2011-01-25 04:53:59 +08:00
usb_ops.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
usb_ops.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
usb_ops_linux.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
usb_osintf.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
usb_vendor_req.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
wifi.h staging: rtl8712: Use __packed instead of __attribute__ ((packed)) 2011-07-05 10:23:57 -07:00
wlan_bssdef.h staging: rtl8712: fixed coding style issues 2011-04-20 14:13:31 -07:00
xmit_linux.c staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00
xmit_osdep.h staging: r8712u: Add the new driver to the mainline kernel 2010-08-20 10:15:30 -05:00