Merge remote-tracking branch 'staging/staging-next'

Conflicts:
	drivers/staging/ccg/f_fs.c
	drivers/staging/ccg/rndis.c
	drivers/staging/dgrp/dgrp_dpa_ops.c
	drivers/staging/dgrp/dgrp_mon_ops.c
	drivers/staging/dgrp/dgrp_net_ops.c
	drivers/staging/dgrp/dgrp_ports_ops.c
	drivers/staging/dgrp/dgrp_specproc.c

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/hwmon/Kconfig
Simple merge

diff --cc drivers/hwmon/Makefile
Simple merge

diff --cc drivers/staging/dgrp/dgrp_net_ops.c
Simple merge

diff --cc drivers/staging/gdm72xx/netlink_k.c
index c1239aaa6282e9fb0c009e651a44d82925c39044,8a92605adbff64db0909b5b40ae6ac9f57d8d5c8..af7f1c1d0b5cb0ea69701a178e707d294da96f30
--- 1/drivers/staging/gdm72xx/netlink_k.c
--- 2/drivers/staging/gdm72xx/netlink_k.c
+++ b/drivers/staging/gdm72xx/netlink_k.c
@@@ -15,9 -15,10 +15,10 @@@
  
  #include <linux/module.h>
  #include <linux/etherdevice.h>
 -#include <linux/netlink.h>
 +#include <net/netlink.h>
  #include <asm/byteorder.h>
  #include <net/sock.h>
+ #include "netlink_k.h"
  
  #if !defined(NLMSG_HDRLEN)
  #define NLMSG_HDRLEN   ((int) NLMSG_ALIGN(sizeof(struct nlmsghdr)))

diff --cc drivers/staging/rts5139/rts51x_scsi.c
Simple merge

diff --cc drivers/staging/rts5139/rts51x_scsi.h
index c2446d02d328a6846b5b35395c609f972d027ae4,3a5213611d21e745cb6b718a3f752fb060658ec6..1a0d705661863558bb86a87509ca116ad23097db
--- 1/drivers/staging/rts5139/rts51x_scsi.h
--- 2/drivers/staging/rts5139/rts51x_scsi.h
+++ b/drivers/staging/rts5139/rts51x_scsi.h
@@@ -147,9 -147,10 +147,8 @@@ struct scsi_cmnd
  
  int slave_alloc(struct scsi_device *sdev);
  int slave_configure(struct scsi_device *sdev);
 -int proc_info(struct Scsi_Host *host, char *buffer,
 -            char **start, off_t offset, int length, int inout);
  int queuecommand(struct Scsi_Host *, struct scsi_cmnd *);
  int command_abort(struct scsi_cmnd *srb);
- int device_reset(struct scsi_cmnd *srb);
  int bus_reset(struct scsi_cmnd *srb);
  
  #endif /* __RTS51X_SCSI_H */

diff --cc drivers/staging/silicom/bp_mod.c
Simple merge