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 branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2011-07-25 23:26:34 -07:00
commit 1380516599
853 changed files with 124830 additions and 263207 deletions
Download patch file Download diff file Expand all files Collapse all files

10
drivers/staging/Kconfig
View file

5
drivers/staging/Makefile
View file

2
drivers/staging/altera-stapl/Kconfig
View file

2
drivers/staging/altera-stapl/Makefile
View file

33
drivers/staging/altera-stapl/altera.c
View file

2
drivers/staging/ath6kl/TODO
View file

56
drivers/staging/ath6kl/os/linux/ar6000_drv.c
View file

211
drivers/staging/ath6kl/os/linux/cfg80211.c
View file

19
drivers/staging/ath6kl/os/linux/include/ar6000_drv.h
View file

11
drivers/staging/ath6kl/os/linux/include/cfg80211.h
View file

2
drivers/staging/ath6kl/os/linux/include/config_linux.h
View file

2
drivers/staging/ath6kl/os/linux/include/ieee80211_ioctl.h
View file

1
drivers/staging/ath6kl/os/linux/include/osapi_linux.h
View file

6
drivers/staging/ath6kl/wmi/wmi.c
View file

2
drivers/staging/bcm/Debug.h
View file

4
drivers/staging/bcm/InterfaceRx.c
View file

4
drivers/staging/bcm/Macros.h
View file

10
drivers/staging/bcm/Misc.c
View file

24
drivers/staging/bcm/PHSModule.c
View file

2
drivers/staging/bcm/PHSModule.h
View file

1
drivers/staging/bcm/headers.h
View file

69
drivers/staging/bcm/sort.c
View file

4
drivers/staging/brcm80211/Makefile
View file

65
drivers/staging/brcm80211/README
View file

14
drivers/staging/brcm80211/TODO
View file

27
drivers/staging/brcm80211/brcmfmac/Makefile
View file

2
drivers/staging/brcm80211/brcmfmac/README
View file

1
drivers/staging/brcm80211/brcmfmac/aiutils.c
View file

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

File diff suppressed because it is too large Load diff

25
drivers/staging/brcm80211/brcmfmac/dhd_linux_sched.c
View file

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

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

File diff suppressed because it is too large Load diff

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

32
drivers/staging/brcm80211/brcmfmac/dngl_stats.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

347
drivers/staging/brcm80211/brcmfmac/sdio_host.h
View file

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

38
drivers/staging/brcm80211/brcmfmac/sdiovar.h
View file

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

File diff suppressed because it is too large Load diff

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

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

File diff suppressed because it is too large Load diff

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

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

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

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

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

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

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

31
drivers/staging/brcm80211/brcmsmac/wlc_types.h → drivers/staging/brcm80211/brcmsmac/ampdu.h
View file

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

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

936
drivers/staging/brcm80211/brcmsmac/bcmotp.c
View file

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

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

174
drivers/staging/brcm80211/brcmsmac/bmac.h
View file

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

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

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

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

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

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

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

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

File diff suppressed because it is too large Load diff

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

670
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

544
drivers/staging/brcm80211/brcmsmac/otp.c
View file

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

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

294
drivers/staging/brcm80211/brcmsmac/phy/phy_hal.h
View file

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

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

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

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

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

8
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

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

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

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

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

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

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