1. 09 Jan, 2012 1 commit
    • Arnd Bergmann's avatar
      Merge branch 'samsung/dt' into samsung/cleanup · a07613a5
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-s3c64xx/Makefile
      	arch/arm/mach-s5pc100/Makefile
      	arch/arm/mach-s5pv210/Makefile
      
      Pull in previously resolved conflicts:
      
      The Makefiles were reorganized in the "rmk/restart" series and modified
      in the "samsung/cleanup series". This also pulls in the other conflict
      resolutions from the restart series against the samsung/dt series.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      a07613a5
  2. 07 Jan, 2012 3 commits
    • Arnd Bergmann's avatar
      Merge branch 'next/cleanup' into samsung/dt · 928a11ba
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-exynos/common.c
      
      The common.c file gets changes from rmk/stable-devel (part of
      next/cleanup), rmk/restart, samsung/dt and follow-on branches
      from the samsung tree.
      
      Pulling it all together here hopefully avoids having to do
      even more conflicting merge changesets in this one file. What
      a mess!
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      928a11ba
    • Arnd Bergmann's avatar
      Merge branch 'depends/rmk/for-linus' into samsung/dt · 237c78be
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-exynos/Makefile
      	arch/arm/mach-exynos/cpu.c -> common.c
      	arch/arm/mach-exynos/include/mach/entry-macro.S
      	arch/arm/mach-exynos/init.c -> common.c
      	arch/arm/mach-s5p64x0/init.c -> common.c
      	arch/arm/mach-s5pv210/init.c -> common.c
      
      Multiple files were moved into common.c files in the rmk/for-linus
      branch, so this moves over the samsung/dt changes to the new
      files.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      237c78be
    • Arnd Bergmann's avatar
      Merge branch 'depends/rmk/restart' into next/cleanup · 40ba95fd
      Arnd Bergmann authored
      Conflicts:
      	arch/arm/mach-at91/at91cap9.c
      	arch/arm/mach-at91/at91sam9260.c
      	arch/arm/mach-at91/at91sam9261.c
      	arch/arm/mach-at91/at91sam9263.c
      	arch/arm/mach-at91/at91sam9g45.c
      	arch/arm/mach-at91/at91sam9rl.c
      	arch/arm/mach-exynos/cpu.c
      	arch/arm/mach-shmobile/board-kota2.c
      
      This resolves a bunch of conflicts between the arm-soc tree
      and changes from the arm tree that have gone upstream.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      40ba95fd
  3. 06 Jan, 2012 1 commit
  4. 05 Jan, 2012 35 commits