kernel/linux
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ synced 2026-11-13 07:31:07 +00:00
Code Issues Releases Packages Activity

Merge Linus's tree into staging-next

Browse source 
This was done to resolve the conflicts that were in a number of files
due to changes done upstream with others done in the staging-next
branch.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2011-06-09 13:49:02 -07:00
commit dc5a18941b
236 changed files with 88811 additions and 96540 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/staging/brcm80211/Kconfig
View file

2
drivers/staging/brcm80211/Makefile
View file

65
drivers/staging/brcm80211/README
View file

14
drivers/staging/brcm80211/TODO
View file

98
drivers/staging/brcm80211/brcmfmac/bcmcdc.h
View file

6
drivers/staging/brcm80211/brcmfmac/bcmchip.h
View file

2
drivers/staging/brcm80211/brcmfmac/bcmsdbus.h
View file

13
drivers/staging/brcm80211/brcmfmac/bcmsdh.c
View file

29
drivers/staging/brcm80211/brcmfmac/bcmsdh_linux.c
View file

196
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.c
View file

2
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc.h
View file

8
drivers/staging/brcm80211/brcmfmac/bcmsdh_sdmmc_linux.c
View file

920
drivers/staging/brcm80211/brcmfmac/dhd.h
View file

2
drivers/staging/brcm80211/brcmfmac/dhd_bus.h
View file

85
drivers/staging/brcm80211/brcmfmac/dhd_cdc.c
View file

152
drivers/staging/brcm80211/brcmfmac/dhd_common.c
View file

8
drivers/staging/brcm80211/brcmfmac/dhd_custom_gpio.c
View file

3
drivers/staging/brcm80211/brcmfmac/dhd_dbg.h
View file

24
drivers/staging/brcm80211/brcmfmac/dhd_linux.c
View file

5
drivers/staging/brcm80211/brcmfmac/dhd_proto.h
View file

907
drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
View file

100
drivers/staging/brcm80211/brcmfmac/dhdioctl.h
View file

75
drivers/staging/brcm80211/brcmfmac/hndrte_armtrap.h
View file

62
drivers/staging/brcm80211/brcmfmac/hndrte_cons.h
View file

61
drivers/staging/brcm80211/brcmfmac/msgtrace.h
View file

2
drivers/staging/brcm80211/include/pcicfg.h → drivers/staging/brcm80211/brcmfmac/pcicfg.h
View file

373
drivers/staging/brcm80211/brcmfmac/sbsdio.h
View file

27
drivers/staging/brcm80211/include/bcmsdh.h → drivers/staging/brcm80211/brcmfmac/sdio_host.h
View file

63
drivers/staging/brcm80211/brcmfmac/sdioh.h
View file

48
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.c
View file

15
drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
View file

66
drivers/staging/brcm80211/brcmfmac/wl_iw.c
View file

4
drivers/staging/brcm80211/brcmfmac/wl_iw.h
View file

45
drivers/staging/brcm80211/brcmsmac/Makefile
View file

508
drivers/staging/brcm80211/brcmsmac/aiutils.c
View file

216
drivers/staging/brcm80211/brcmsmac/aiutils.h
View file

38
drivers/staging/brcm80211/brcmsmac/wlc_alloc.c → drivers/staging/brcm80211/brcmsmac/alloc.c
View file

0
drivers/staging/brcm80211/brcmsmac/wlc_alloc.h → drivers/staging/brcm80211/brcmsmac/alloc.h
View file

48
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.c → drivers/staging/brcm80211/brcmsmac/ampdu.c
View file

6
drivers/staging/brcm80211/brcmsmac/wlc_ampdu.h → drivers/staging/brcm80211/brcmsmac/ampdu.h
View file

39
drivers/staging/brcm80211/brcmsmac/wlc_antsel.c → drivers/staging/brcm80211/brcmsmac/antsel.c
View file

6
drivers/staging/brcm80211/brcmsmac/wlc_antsel.h → drivers/staging/brcm80211/brcmsmac/antsel.h
View file

714
drivers/staging/brcm80211/brcmsmac/bcmsrom.c
View file

108
drivers/staging/brcm80211/brcmsmac/wlc_bmac.c → drivers/staging/brcm80211/brcmsmac/bmac.c
View file

17
drivers/staging/brcm80211/brcmsmac/wlc_bmac.h → drivers/staging/brcm80211/brcmsmac/bmac.h
View file

31
drivers/staging/brcm80211/brcmsmac/wlc_channel.c → drivers/staging/brcm80211/brcmsmac/channel.c
View file

11
drivers/staging/brcm80211/brcmsmac/wlc_channel.h → drivers/staging/brcm80211/brcmsmac/channel.h
View file

49
drivers/staging/brcm80211/brcmsmac/d11.h
View file

293
drivers/staging/brcm80211/brcmsmac/hnddma.c → drivers/staging/brcm80211/brcmsmac/dma.c
View file

139
drivers/staging/brcm80211/include/hnddma.h → drivers/staging/brcm80211/brcmsmac/dma.h
View file

704
drivers/staging/brcm80211/brcmsmac/wl_mac80211.c → drivers/staging/brcm80211/brcmsmac/mac80211_if.c
View file

74
drivers/staging/brcm80211/brcmsmac/wl_mac80211.h → drivers/staging/brcm80211/brcmsmac/mac80211_if.h
View file

2102
drivers/staging/brcm80211/brcmsmac/wlc_main.c → drivers/staging/brcm80211/brcmsmac/main.c
View file

322
drivers/staging/brcm80211/brcmsmac/wlc_main.h → drivers/staging/brcm80211/brcmsmac/main.h
View file

391
drivers/staging/brcm80211/brcmsmac/nicpci.c
View file

85
drivers/staging/brcm80211/brcmsmac/nicpci.h
View file

215
drivers/staging/brcm80211/brcmsmac/nvram.c
View file

460
drivers/staging/brcm80211/brcmsmac/bcmotp.c → drivers/staging/brcm80211/brcmsmac/otp.c
View file

11
drivers/staging/brcm80211/include/bcmotp.h → drivers/staging/brcm80211/brcmsmac/otp.h
View file

106
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_cmn.c → drivers/staging/brcm80211/brcmsmac/phy/phy_cmn.c
View file

51
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_hal.h → drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
View file

31
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_int.h → drivers/staging/brcm80211/brcmsmac/phy/phy_int.h
View file

21
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.c → drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.c
View file

6
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_lcn.h → drivers/staging/brcm80211/brcmsmac/phy/phy_lcn.h
View file

24
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_n.c → drivers/staging/brcm80211/brcmsmac/phy/phy_n.c
View file

2
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.c → drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.c
View file

6
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_qmath.h → drivers/staging/brcm80211/brcmsmac/phy/phy_qmath.h
View file

6
drivers/staging/brcm80211/brcmsmac/phy/wlc_phy_radio.h → drivers/staging/brcm80211/brcmsmac/phy/phy_radio.h
View file

36
drivers/staging/brcm80211/brcmsmac/phy/phy_version.h
View file

0
drivers/staging/brcm80211/brcmsmac/phy/wlc_phyreg_n.h → drivers/staging/brcm80211/brcmsmac/phy/phyreg_n.h
View file

6
drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.c → drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.c
View file

0
drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_lcn.h → drivers/staging/brcm80211/brcmsmac/phy/phytbl_lcn.h
View file

6
drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.c → drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.c
View file

0
drivers/staging/brcm80211/brcmsmac/phy/wlc_phytbl_n.h → drivers/staging/brcm80211/brcmsmac/phy/phytbl_n.h
View file

60
drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.c → drivers/staging/brcm80211/brcmsmac/phy_shim.c
View file

61
drivers/staging/brcm80211/brcmsmac/wlc_phy_shim.h → drivers/staging/brcm80211/brcmsmac/phy_shim.h
View file

552
drivers/staging/brcm80211/brcmsmac/wlc_pmu.c → drivers/staging/brcm80211/brcmsmac/pmu.c
View file

42
drivers/staging/brcm80211/brcmsmac/wlc_pmu.h → drivers/staging/brcm80211/brcmsmac/pmu.h
View file

160
drivers/staging/brcm80211/brcmsmac/wlc_pub.h → drivers/staging/brcm80211/brcmsmac/pub.h
View file

18
drivers/staging/brcm80211/brcmsmac/wlc_rate.c → drivers/staging/brcm80211/brcmsmac/rate.c
View file

0
drivers/staging/brcm80211/brcmsmac/wlc_rate.h → drivers/staging/brcm80211/brcmsmac/rate.h
View file

9
drivers/staging/brcm80211/brcmsmac/wlc_scb.h → drivers/staging/brcm80211/brcmsmac/scb.h
View file

977
drivers/staging/brcm80211/brcmsmac/bcmsrom_tbl.h → drivers/staging/brcm80211/brcmsmac/srom.c
View file

12
drivers/staging/brcm80211/include/bcmsrom.h → drivers/staging/brcm80211/brcmsmac/srom.h
View file

67
drivers/staging/brcm80211/brcmsmac/wlc_stf.c → drivers/staging/brcm80211/brcmsmac/stf.c
View file

8
drivers/staging/brcm80211/brcmsmac/wlc_stf.h → drivers/staging/brcm80211/brcmsmac/stf.h
View file

278
drivers/staging/brcm80211/brcmsmac/wlc_cfg.h → drivers/staging/brcm80211/brcmsmac/types.h
View file

78
drivers/staging/brcm80211/brcmsmac/wl_ucode_loader.c → drivers/staging/brcm80211/brcmsmac/ucode_loader.c
View file

15
drivers/staging/brcm80211/brcmsmac/wl_ucode.h → drivers/staging/brcm80211/brcmsmac/ucode_loader.h
View file

92
drivers/staging/brcm80211/brcmsmac/wl_dbg.h
View file

47
drivers/staging/brcm80211/brcmsmac/wl_export.h
View file

135
drivers/staging/brcm80211/brcmsmac/wlc_bsscfg.h
View file

140
drivers/staging/brcm80211/brcmsmac/wlc_key.h
View file

37
drivers/staging/brcm80211/brcmsmac/wlc_types.h
View file

6
drivers/staging/brcm80211/util/Makefile → drivers/staging/brcm80211/brcmutil/Makefile
View file

143
drivers/staging/brcm80211/util/bcmutils.c → drivers/staging/brcm80211/brcmutil/utils.c
View file

18
drivers/staging/brcm80211/util/bcmwifi.c → drivers/staging/brcm80211/brcmutil/wifi.c
View file

374
drivers/staging/brcm80211/include/aidmp.h
View file

150
drivers/staging/brcm80211/include/bcmdefs.h
View file

124
drivers/staging/brcm80211/include/bcmdevs.h
View file

Some files were not shown because too many files have changed in this diff Show more