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/setup.c b/arch/arc/kernel/setup.c
index f63b8bfefb0c..2ee7a4d758a8 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -392,7 +392,7 @@ void __init setup_arch(char **cmdline_p)
                 /*
                  * If we are here, it is established that @uboot_arg didn't
                  * point to DT blob. Instead if u-boot says it is cmdline,
-                 * Appent to embedded DT cmdline.
+                 * append to embedded DT cmdline.
                  * setup_machine_fdt() would have populated @boot_command_line
                  */
                 if (uboot_tag == 1) {