Merge branches 'fixes', 'misc', 'pgt' and 'restart-base' into for-next

diff --cc arch/arm/include/asm/mach/arch.h
index 2b0efc3104ac6f73846fb89cdf0761c400676540,7d19425dd496a083eb98557bafe2980843bc9fa3,217aa1911dd7a01641a8d9e85220c2128d263b0b,6fe6cf0895c94e7c191a8592a2218c91bd916005..bcb0c883e21ed06aa18c9f48354314c877523a8b
--- 1/arch/arm/include/asm/mach/arch.h
--- 2/arch/arm/include/asm/mach/arch.h
--- 3/arch/arm/include/asm/mach/arch.h
--- 4/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@@@@ -31,11 -30,11 -30,12 -30,11 +31,11 @@@@@ struct machine_desc 
        unsigned int            video_start;    /* start of video RAM   */
        unsigned int            video_end;      /* end of video RAM     */
    
---     unsigned int            reserve_lp0 :1; /* never has lp0        */
---     unsigned int            reserve_lp1 :1; /* never has lp1        */
---     unsigned int            reserve_lp2 :1; /* never has lp2        */
---     unsigned int            soft_reboot :1; /* soft reboot          */
  -     void                    (*fixup)(struct machine_desc *,
  -                                      struct tag *, char **,
+++     unsigned char           reserve_lp0 :1; /* never has lp0        */
+++     unsigned char           reserve_lp1 :1; /* never has lp1        */
+++     unsigned char           reserve_lp2 :1; /* never has lp2        */
+++     char                    restart_mode;   /* default restart mode */
  +     void                    (*fixup)(struct tag *, char **,
                                         struct meminfo *);
        void                    (*reserve)(void);/* reserve mem blocks  */
        void                    (*map_io)(void);/* IO mapping function  */

diff --cc arch/arm/include/asm/pgtable.h
Simple merge

diff --cc arch/arm/kernel/machine_kexec.c
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge