leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4e0f05297f
linux/drivers/staging/rtl8187se
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
..
ieee80211 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
Kconfig staging/rtl81*: build as loadable modules only 2011-04-04 22:46:15 -07:00
Makefile Staging: rtl8187se: Makefile: replace the use of <module>-objs with <module>-y 2010-10-08 07:23:45 -07:00
r8180_93cx6.h
r8180_core.c get rid of create_proc_entry() abuses - proc_mkdir() is there for purpose 2011-07-24 10:12:33 -04:00
r8180_dm.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r8180_dm.h Staging: rtl8187se: r8180.h: fixed alot of checkpatch.pl issues 2010-09-21 10:49:31 -07:00
r8180_hw.h Staging: rtl8187se: r8180_hw: fixed a lot of checkpatch.pl issues 2010-09-21 10:49:31 -07:00
r8180_rtl8225.h Staging: rtl8187se: r8180_rtl8225: fixed a lot of checkpatch.pl issues 2010-09-21 10:49:32 -07:00
r8180_rtl8225z2.c Fix common misspellings 2011-03-31 11:26:23 -03:00
r8180_wx.c Staging: rtl8187se: r8180_wx: fixed a lot of checkptahc.pl issues 2010-09-21 10:49:32 -07:00
r8180_wx.h
r8180.h net/staging: add needed interrupt.h and hardirq.h includes 2011-06-19 22:41:59 -07:00
r8185b_init.c Fix common misspellings 2011-03-31 11:26:23 -03:00
TODO