openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
linux/drivers/staging/lirc
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 [media] lirc: remove staging lirc_it87 and lirc_ite8709 drivers 2011-03-22 17:20:13 -03:00
Makefile [media] lirc: remove staging lirc_it87 and lirc_ite8709 drivers 2011-03-22 17:20:13 -03:00
TODO V4L/DVB: staging/lirc: wire up Kconfig and Makefile bits 2010-08-02 16:43:34 -03:00
TODO.lirc_zilog [media] lirc_zilog: Update TODO list based on work completed and revised plans 2011-03-22 19:24:01 -03:00
lirc_bt829.c staging/lirc_bt829: Return -ENODEV when no hardware is found. 2011-07-18 13:22:52 -07:00
lirc_ene0100.h Fix common misspellings 2011-03-31 11:26:23 -03:00
lirc_igorplugusb.c [media] lirc_igorplugusb: add Fit PC2 device ID 2010-10-22 20:05:37 -02:00
lirc_imon.c [media] [staging] lirc_imon: fix unused-but-set warnings 2011-06-11 09:02:17 -03:00
lirc_parallel.c staging/lirc_parallel: remove pointless prototypes. 2011-07-18 13:22:52 -07:00
lirc_parallel.h V4L/DVB: staging/lirc: add lirc_parallel driver 2010-08-02 16:43:27 -03:00
lirc_sasem.c [media] lirc_sasem: key debug spew off debug modparam 2011-05-20 09:27:39 -03:00
lirc_serial.c [media] [staging] lirc_serial: allocate irq at init time 2011-07-01 16:32:45 -03:00
lirc_sir.c [media] [staging] lirc_sir: fix unused-but-set warnings 2011-06-11 09:02:23 -03:00
lirc_ttusbir.c Remove unneeded version.h includes from drivers/staging/lirc/ 2011-07-05 10:39:39 -07:00
lirc_zilog.c 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