linux/drivers/staging/hv
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
..
tools treewide: remove duplicate includes 2011-06-20 16:08:19 +02:00
Kconfig Staging: hv: Add the necessary dependencies to hyperv Kconfig 2011-05-06 09:27:34 -07:00
Makefile Staging: hv: Move the contents of blkvsc.c to blkvsc_drv.c 2011-04-04 21:50:44 -07:00
TODO staging: hv: Convert vmbus driver interface function pointer table to constant 2010-09-14 16:27:12 -07:00
blkvsc_drv.c Staging: hv: blkvsc: We don't support removable media; get rid of unnecessary state 2011-06-07 13:45:51 -07:00
channel.c Staging: hv: vmbus: Increase the timeout value in the vmbus driver 2011-07-05 08:59:23 -07:00
channel_mgmt.c Staging: hv: vmbus: Increase the timeout value in the vmbus driver 2011-07-05 08:59:23 -07:00
connection.c Staging: hv: vmbus: Increase the timeout value in the vmbus driver 2011-07-05 08:59:23 -07:00
hv.c Staging: hv: vmbus: Cleanup error codes in hv.c 2011-06-07 13:46:06 -07:00
hv_kvp.c Staging: hv: vmbus_drv: Move the contents of vmbus_private.h to vmbus_hyperv.h 2011-05-17 12:27:04 -07:00
hv_kvp.h Fix common misspellings 2011-03-31 11:26:23 -03:00
hv_mouse.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
hv_timesource.c Remove unneeded version.h include from drivers/staging/hv/hv_timesource.c 2011-07-05 09:10:47 -07:00
hv_util.c Staging: hv: Re-implement the synchronization for util channels 2011-05-17 13:36:50 -07:00
hyperv.h Staging: hv: vmbus: Embed the state needed to close the channel 2011-06-07 13:45:59 -07:00
hyperv_net.h staging: hv: remove netvsc send buffer and related functions 2011-06-07 13:39:23 -07:00
hyperv_storage.h Staging: hv: Move the contents of storvsc_api.h to hyperv_storage.h 2011-05-17 12:27:06 -07:00
hyperv_vmbus.h Staging: hv: vmbus: Get rid of an unused function in connection.c 2011-06-07 13:46:01 -07:00
netvsc.c staging: hv: fix some white spaces in netvsc driver 2011-07-05 09:10:47 -07:00
netvsc_drv.c staging: hv: fix some white spaces in netvsc driver 2011-07-05 09:10:47 -07:00
ring_buffer.c Staging: hv: vmbus: Change the memory barrier in hv_ringbuffer_write() 2011-06-07 13:45:56 -07:00
rndis_filter.c Staging: hv: netvsc: Increase the timeout value in the netvsc driver 2011-07-05 08:59:23 -07:00
storvsc.c Staging: hv: storvsc: Increase the timeout value in the storvsc driver 2011-07-05 08:59:24 -07:00
storvsc_drv.c Staging: hv: storvsc: Increase the timeout value in the storvsc driver 2011-07-05 08:59:24 -07:00
vmbus_drv.c Staging: hv: vmbus: Properly handle the error in hv_acpi_init() 2011-07-05 08:59:24 -07:00