• A
    Merge branch 'spear/dt' into next/dt2 · a94c7b0a
    Arnd Bergmann 提交于
    * spear/dt:
      ARM: SPEAr600: Add device-tree support to SPEAr600 boards
    
    (update to v3.3-rc7)
    
    Conflicts:
    	arch/arm/mach-spear6xx/spear6xx.c
    	arch/arm/mach-vexpress/Kconfig
    
    The conflicts are between the previous contents of the next/dt2
    branch and upstream changes from v3.3-rc7.
    Signed-off-by: NArnd Bergmann <arnd@arndb.de>
    a94c7b0a
mmci.c 36.2 KB