* git://git.kernel.org/pub/scm/linux/kernel/git/lwfinger/r8192E: (166 commits)
  staging: rtl8192e: Remove files that are not used
  staging: rtl8192e: Convert typedefs that can be replaced with #define
  staging: rtl8192e: Convert typedef HT_AGGRE_SIZE_E to enum ht_aggre_size
  staging: rtl8192e: Convert typedef RATR_TABLE_MODE_8192S to enum ratr_table_mode_8192s
  staging: rtl8192e: Convert typedef FW_CMD_IO_TYPE to enum fw_cmd_io_type
  staging: rtl8192e: Convert typedef SCAN_OPERATION_BACKUP_OPT to enum scan_op_backup_opt
  staging: rtl8192e: Convert typedef country_code_type_t to enum country_code_type
  staging: rtl8192e: Convert typedef WOLPATTERN_TYPE to enum wol_pattern_type
  staging: rtl8192e: Convert typedef RT_RF_POWER_STATE to enum rt_rf_power_state
  staging: rtl8192e: Convert typedef RT_JOIN_ACTION to enum rt_join_action
  staging: rtl8192e: Convert typedef IPS_CALLBACK_FUNCION to enum ips_callback_function
  staging: rtl8192e: Convert typedef RT_PS_MODE to enum rt_ps_mode
  staging: rtl8192e: Convert typedef Fsync_State to enum fsync_state
  staging: rtl8192e: Convert typedef erp_t to enum erp_t
  staging: rtl8192e: Convert typedef WIRELESS_NETWORK_TYPE to enum wireless_network_type
  staging: rtl8192e: Convert typedef WIRELESS_MODE to enum wireless_mode
  staging: rtl8192e: Convert typedef RT_RF_TYPE_DEF to enum rt_rf_type_def
  staging: rtl8192e: Convert typedef LED_CTL_MODE to enum led_ctl_mode
  staging: rtl8192e: Convert typedef InitialGainOpType to enum init_gain_op_type
  staging: rtl8192e: Convert typedef BA_ACTION to enum ba_action
  ...

For the most part, these extra files came from the previous version
of the RTL8192E driver.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

This was needed by one of the generic serial drivers that was removed a
while ago.  No one even noticed that the driver could not be built
properly while it was in the staging directory.

So this removed the unneeded .h file.
Reported-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Delete a string which is always empty.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Delete version information, it's just noise and serves no purpose.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Delete couple write-only variables.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

This patch converts the nvec to use mfd cells and improves the
registration of the platform driver. The child drivers are also
converted to use mfd cells and platform registration.
Signed-off-by: Marc Dietrich <marvin24@gmx.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Stop exporting functions only intended for core usage.
Return void from function which can never return anything other than 0.
Trivial stype cleanups.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Need this out the way to create a trigger_consumer.h that actually is
for trigger consumers.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

This is always true, so lets make it explicit.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

The device is static and should never actually be deleted. The release
is just to avoid a warning from the kernel.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

staging:iio:triggers reorder module put and device put to ensure that the ops are still there if put results in device deletion.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

This is to do with dynamically allocated triggers and the need to ensure
the underlying structures don't go away when a consumer is using them.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

This is needed and makes the linux-next merge easier.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>
Cc: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

This is needed to fix the build on alpha and ppc at the least.
Reported-by: Andrew Morton <akpm@linux-foundation.org>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: edwin_rong <edwin_rong@realsil.com.cn>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>

Remove typedef from enum.
Rename enum.
Rename uses.
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>