1. 27 12月, 2012 1 次提交
  2. 26 12月, 2012 5 次提交
  3. 13 12月, 2012 2 次提交
  4. 12 12月, 2012 2 次提交
  5. 08 12月, 2012 1 次提交
    • S
      Merge branch 'master' of git://git.denx.de/u-boot into master · 05a860c2
      Stefano Babic 提交于
      Conflicts:
      	drivers/power/power_fsl.c
      	include/configs/mx35pdk.h
      	include/configs/mx53loco.h
      	include/configs/woodburn_common.h
      	board/woodburn/woodburn.c
      
      These boards still use the old old PMIC framework, so they
      do not merge properly after the power framework was merged into
      mainline.
      
      Fix all conflicts and update woodburn to use Power Framework.
      Signed-off-by: NStefano Babic <sbabic@denx.de>
      05a860c2
  6. 07 12月, 2012 29 次提交