Merge 3.17-rc5 into staging-next.

This fixes a merge conflict in lustre, and we want the other fixes that
went into 3.17-rc5 as well.

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

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/staging/android/sync.c
Simple merge

diff --cc drivers/staging/imx-drm/ipuv3-plane.c
Simple merge

diff --cc drivers/staging/lustre/lustre/llite/llite_lib.c
index 097ee1bd810c4fc411130cdc82c295aa57db49a1,0c59e26c080583f85df3bf21194e777bdab7a079..7f4ca320aa8aeabaed272bbb6f421dd8325eaccd
--- 1/drivers/staging/lustre/lustre/llite/llite_lib.c
--- 2/drivers/staging/lustre/lustre/llite/llite_lib.c
+++ b/drivers/staging/lustre/lustre/llite/llite_lib.c
@@@ -574,8 -568,7 +574,8 @@@ static int client_common_fill_super(str
        if (sb->s_root == NULL) {
                CERROR("%s: can't make root dentry\n",
                        ll_get_fsname(sb, NULL, 0));
 -              GOTO(out_lock_cn_cb, err = -ENOMEM);
 +              err = -ENOMEM;
-               goto out_root;
++              goto out_lock_cn_cb;
        }
  
        sbi->ll_sdev_orig = sb->s_dev;