Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/arc/kernel/perf_event.c b/arch/arc/kernel/perf_event.c
index 6fd48021324b..08f03d9b5b3e 100644
--- a/arch/arc/kernel/perf_event.c
+++ b/arch/arc/kernel/perf_event.c
@@ -108,7 +108,7 @@ static void arc_perf_event_update(struct perf_event *event,
         int64_t delta = new_raw_count - prev_raw_count;
 
         /*
-         * We don't afaraid of hwc->prev_count changing beneath our feet
+         * We aren't afraid of hwc->prev_count changing beneath our feet
          * because there's no way for us to re-enter this function anytime.
          */
         local64_set(&hwc->prev_count, new_raw_count);