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
Showing
- MAINTAINERS 13 additions, 1 deletionMAINTAINERS
- arch/x86/include/asm/hyperv.h 1 addition, 0 deletionsarch/x86/include/asm/hyperv.h
- drivers/Kconfig 2 additions, 0 deletionsdrivers/Kconfig
- drivers/Makefile 1 addition, 0 deletionsdrivers/Makefile
- drivers/char/scc.h 0 additions, 613 deletionsdrivers/char/scc.h
- drivers/hv/Kconfig 14 additions, 0 deletionsdrivers/hv/Kconfig
- drivers/hv/Makefile 7 additions, 0 deletionsdrivers/hv/Makefile
- drivers/hv/channel.c 30 additions, 92 deletionsdrivers/hv/channel.c
- drivers/hv/channel_mgmt.c 26 additions, 164 deletionsdrivers/hv/channel_mgmt.c
- drivers/hv/connection.c 43 additions, 15 deletionsdrivers/hv/connection.c
- drivers/hv/hv.c 8 additions, 17 deletionsdrivers/hv/hv.c
- drivers/hv/hv_kvp.c 27 additions, 22 deletionsdrivers/hv/hv_kvp.c
- drivers/hv/hv_kvp.h 1 addition, 1 deletiondrivers/hv/hv_kvp.h
- drivers/hv/hv_util.c 129 additions, 81 deletionsdrivers/hv/hv_util.c
- drivers/hv/hyperv_vmbus.h 7 additions, 10 deletionsdrivers/hv/hyperv_vmbus.h
- drivers/hv/ring_buffer.c 6 additions, 36 deletionsdrivers/hv/ring_buffer.c
- drivers/hv/vmbus_drv.c 228 additions, 244 deletionsdrivers/hv/vmbus_drv.c
- drivers/staging/Kconfig 2 additions, 2 deletionsdrivers/staging/Kconfig
- drivers/staging/Makefile 1 addition, 2 deletionsdrivers/staging/Makefile
- drivers/staging/altera-stapl/altera.c 2 additions, 1 deletiondrivers/staging/altera-stapl/altera.c
Loading
Please register or sign in to comment