| commit | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 | [log] [tgz] |
|---|---|---|
| author | Stefano Babic <sbabic@denx.de> | Sat Dec 08 12:02:45 2012 +0100 |
| committer | Stefano Babic <sbabic@denx.de> | Sat Dec 08 12:02:45 2012 +0100 |
| tree | 764536da9202b9de387a0d957829f64dfba818b7 | |
| parent | 393ff47ba3123208f7c4f08d63f114300a41d0c4 [diff] | |
| parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 [diff] |
Merge branch 'master' of git://git.denx.de/u-boot into master 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: Stefano Babic <sbabic@denx.de>