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

diff --cc arch/arm/mach-socfpga/socfpga.c
index 5fb6f79059a882f6629a4dc7287f71026334ebfe,cc64576c102ba05265df62389e47835f3ad20ccb..afd98971d9034335cf2340b3462df91c756fcdc7
--- 1/arch/arm/mach-socfpga/socfpga.c
--- 2/arch/arm/mach-socfpga/socfpga.c
+++ b/arch/arm/mach-socfpga/socfpga.c
@@@ -32,7 -32,9 +32,9 @@@ void __iomem *rst_manager_base_addr
  void __iomem *sdr_ctl_base_addr;
  unsigned long socfpga_cpu1start_addr;
  
 -void __init socfpga_sysmgr_init(void)
+ extern void __init socfpga_reset_init(void);
+ 
 +static void __init socfpga_sysmgr_init(void)
  {
        struct device_node *np;