linux-kernel-test/drivers/staging/hv
Linus Torvalds aa77677e0a Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
* 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1519 commits)
  staging: et131x: Remove redundant check and return statement
  staging: et131x: Mainly whitespace changes to appease checkpatch
  staging: et131x: Remove last of the forward declarations
  staging: et131x: Remove even more forward declarations
  staging: et131x: Remove yet more forward declarations
  staging: et131x: Remove more forward declarations
  staging: et131x: Remove forward declaration of et131x_adapter_setup
  staging: et131x: Remove some forward declarations
  staging: et131x: Remove unused rx_ring.recv_packet_pool
  staging: et131x: Remove call to find pci pm capability
  staging: et131x: Remove redundant et131x_reset_recv() call
  staging: et131x: Remove unused rx_ring.recv_buffer_pool
  Staging: bcm: Fix three initialization errors in InterfaceDld.c
  Staging: bcm: Fix coding style issues in InterfaceDld.c
  staging:iio:dac: Add AD5360 driver
  staging:iio:trigger:bfin-timer: Fix compile error
  Staging: vt6655: add some range checks before memcpy()
  Staging: vt6655: whitespace fixes to iotcl.c
  Staging: vt6656: add some range checks before memcpy()
  Staging: vt6656: whitespace cleanups in ioctl.c
  ...

Fix up conflicts in:
 - drivers/{Kconfig,Makefile}, drivers/staging/{Kconfig,Makefile}:
	vg driver movement
 - drivers/staging/brcm80211/brcmfmac/{dhd_linux.c,mac80211_if.c}:
	driver removal vs now stale changes
 - drivers/staging/rtl8192e/r8192E_core.c:
	driver removal vs now stale changes
 - drivers/staging/et131x/et131*:
	driver consolidation into one file, tried to do fixups
2011-10-26 15:39:02 +02:00
..
hv_mouse.c Staging: hv: mousevsc: Fix a checkpatch warning 2011-10-17 15:24:48 -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
hyperv_net.h Staging: hv: move hyperv code out of staging directory 2011-10-10 22:52:55 -06:00
Kconfig Staging: hv: move hyperv code out of staging directory 2011-10-10 22:52:55 -06:00
Makefile Staging: hv: move hyperv code out of staging directory 2011-10-10 22:52:55 -06:00
netvsc_drv.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging 2011-10-26 15:39:02 +02:00
netvsc.c Staging: hv: netvsc: Rename netDevice as net_device 2011-09-16 20:06:04 +02:00
rndis_filter.c Staging: hv: netvsc: Fix a dereferencing issue 2011-10-10 22:50:00 -06:00
storvsc_drv.c Staging: hv: storvsc: Fix checkpatch warnings 2011-10-17 15:24:49 -07:00
TODO staging: hv: remove the carrier status check from netvsc_open() 2011-09-29 17:34:50 -07:00