Merge branches 'amba', 'clkdev', 'fixes', 'mach-types', 'misc' and 'mmci' into for...

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/kernel/signal.c
index 7cb532fc8aa4e3a9dc1e9d63d4cb887a08b1fad1,7cb532fc8aa4e3a9dc1e9d63d4cb887a08b1fad1,d68d1b6946809831458d03d8a020ea32f571c62f,7cb532fc8aa4e3a9dc1e9d63d4cb887a08b1fad1,6e67f1bf1a6a935ba7a8fd3497debe97e1082da1,7cb532fc8aa4e3a9dc1e9d63d4cb887a08b1fad1..73d9a420850def55f6ea65cc1b00aa85c6d3245f
--- 1/arch/arm/kernel/signal.c
--- 2/arch/arm/kernel/signal.c
--- 3/arch/arm/kernel/signal.c
--- 4/arch/arm/kernel/signal.c
--- 5/arch/arm/kernel/signal.c
--- 6/arch/arm/kernel/signal.c
+++ b/arch/arm/kernel/signal.c
@@@@@@@ -189,26 -189,26 -187,10 -189,26 -189,26 -189,26 +187,10 @@@@@@@ static int preserve_vfp_context(struct 
        __put_user_error(magic, &frame->magic, err);
        __put_user_error(size, &frame->size, err);
      
-- ---  /*
-- ---   * Copy the floating point registers. There can be unused
-- ---   * registers see asm/hwcap.h for details.
-- ---   */
-- ---  err |= __copy_to_user(&frame->ufp.fpregs, &h->fpregs,
-- ---                        sizeof(h->fpregs));
-- ---  /*
-- ---   * Copy the status and control register.
-- ---   */
-- ---  __put_user_error(h->fpscr, &frame->ufp.fpscr, err);
-- ---
-- ---  /*
-- ---   * Copy the exception registers.
-- ---   */
-- ---  __put_user_error(h->fpexc, &frame->ufp_exc.fpexc, err);
-- ---  __put_user_error(h->fpinst, &frame->ufp_exc.fpinst, err);
-- ---  __put_user_error(h->fpinst2, &frame->ufp_exc.fpinst2, err);
    - 
    -   return err ? -EFAULT : 0;
++ +++  if (err)
++ +++          return -EFAULT;
    + 
-- - -  return err ? -EFAULT : 0;
++ +++  return vfp_preserve_user_clear_hwstate(&frame->ufp, &frame->ufp_exc);
      }
      
      static int restore_vfp_context(struct vfp_sigframe __user *frame)