1. 12 11月, 2013 4 次提交
  2. 10 11月, 2013 1 次提交
    • A
      Merge branch 'iu-boot/master' into 'u-boot-arm/master' · 85b8c5c4
      Albert ARIBAUD 提交于
      Conflicts:
      	arch/arm/cpu/arm926ejs/mxs/Makefile
      	board/compulab/cm_t35/Makefile
      	board/corscience/tricorder/Makefile
      	board/ppcag/bg0900/Makefile
      	drivers/bootcount/Makefile
      	include/configs/omap4_common.h
      	include/configs/pdnb3.h
      
      Makefile conflicts are due to additions/removals of
      object files on the ARM branch vs KBuild introduction
      on the main branch. Resolution consists in adjusting
      the list of object files in the main branch version.
      This also applies to two files which are not listed
      as conflicting but had to be modified:
      
      	board/compulab/common/Makefile
      	board/udoo/Makefile
      
      include/configs/omap4_common.h conflicts are due to
      the OMAP4 conversion to ti_armv7_common.h on the ARM
      side, and CONFIG_SYS_HZ removal on the main side.
      Resolution is to convert as this icludes removal of
      CONFIG_SYS_HZ.
      
      include/configs/pdnb3.h is due to a removal on ARM side.
      Trivial resolution is to remove the file.
      
      Note: 'git show' will also list two files just because
      they are new:
      
      	include/configs/am335x_igep0033.h
      	include/configs/omap3_igep00x0.h
      85b8c5c4
  3. 09 11月, 2013 31 次提交
  4. 08 11月, 2013 4 次提交