remarkable-linux/drivers/staging/ath6kl
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
..
bmi ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
hif ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
htc2 ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
include ath6kl: Remove ununsed macros from gpio_reg.h 2011-05-06 09:31:55 -07:00
miscdrv ath6kl: Remove ununsed macros from gpio_reg.h 2011-05-06 09:31:55 -07:00
os/linux 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
reorder ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
wlan ath6kl: Replace data type macros with kernel defined ones 2011-05-03 12:29:58 -07:00
wmi staging: ath6kl: implement testmode rx command 2011-07-05 20:29:16 -07:00
Kconfig staging: fix ath6kl build when CFG80211 is not enabled 2011-06-07 12:28:40 -07:00
Makefile ath6kl: use CONFIG_ATH6KL_ENABLE_COEXISTENCE 2011-04-04 22:58:13 -07:00
TODO Ath6kl: TODO: Fix spelling :) 2011-07-08 14:03:37 -07:00