Skip to content
  • Linus Torvalds's avatar
    Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · aa77677e
    Linus Torvalds authored
    * '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
    aa77677e