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

# Conflicts:
#	drivers/reset/core.c

diff --cc drivers/reset/Kconfig
Simple merge

diff --cc drivers/reset/core.c
index 71c1c8264b2db7c44446a46b6535e5b119ef62a1,123b0c53a857484e30c4c4f1192b07472b33726b..63852076a5a37746b5a0ed10a5e5376c9bda361b
--- 1/drivers/reset/core.c
--- 2/drivers/reset/core.c
+++ b/drivers/reset/core.c
@@@ -724,29 -610,9 +724,29 @@@ void reset_control_release(struct reset
  }
  EXPORT_SYMBOL_GPL(reset_control_release);
  
- static struct reset_control *__reset_control_get_internal(
-                               struct reset_controller_dev *rcdev,
-                               unsigned int index, bool shared, bool acquired)
 +/**
 + * reset_control_bulk_release() - releases exclusive access to reset controls
 + * @num_rstcs: number of entries in rstcs array
 + * @rstcs: array of struct reset_control_bulk_data with reset controls set
 + *
 + * Releases exclusive access right to reset controls previously obtained by a
 + * call to reset_control_bulk_acquire().
 + *
 + * See also: reset_control_release(), reset_control_bulk_acquire()
 + */
 +void reset_control_bulk_release(int num_rstcs,
 +                              struct reset_control_bulk_data *rstcs)
 +{
 +      int i;
 +
 +      for (i = 0; i < num_rstcs; i++)
 +              reset_control_release(rstcs[i].rstc);
 +}
 +EXPORT_SYMBOL_GPL(reset_control_bulk_release);
 +
+ static struct reset_control *
+ __reset_control_get_internal(struct reset_controller_dev *rcdev,
+                            unsigned int index, bool shared, bool acquired)
  {
        struct reset_control *rstc;