Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 13:39:02 +0000 (15:39 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 26 Oct 2011 13:39:02 +0000 (15:39 +0200)
commitaa77677e0a288e08073620db5d2a31df83ca4788
tree0d14b995a21c43f365d66b9ad101a334109fc4e4
parentefb8d21b2c6db3497655cc6a033ae8a9883e4063
parent43a3beb6da994549ec28a9f31727b997a025f958
Merge branch 'staging-next' of git://git./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
12 files changed:
MAINTAINERS
drivers/Kconfig
drivers/Makefile
drivers/staging/Kconfig
drivers/staging/Makefile
drivers/staging/et131x/et131x.c
drivers/staging/hv/netvsc_drv.c
drivers/staging/iio/addac/adt7316-i2c.c
drivers/staging/iio/dds/ad9832.c
drivers/staging/vt6655/device_main.c
drivers/staging/vt6656/main_usb.c
drivers/staging/wlags49_h2/wl_netdev.c