• Arnd Bergmann's avatar
    Merge branch 'samsung/dt' into next/dt · b001befe
    Arnd Bergmann authored
    * samsung/dt: (3 commit)
      Merge branch 'depends/rmk/for-linus' into samsung/dt
      Merge branch 'depends/rmk/restart' into next/cleanup
      Merge branch 'next/cleanup' into samsung/dt
    
    Conflicts:
    	arch/arm/mach-tegra/board-dt.c
    	arch/arm/mach-tegra/include/mach/entry-macro.S
    
    The latest version of the samsung/dt branch resolves
    all sorts of conflicts with the latest upstream, no functional
    changes that are not already there.
    Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
    b001befe
board-dt.c 4.95 KB