Stefano Babic 05a860c228
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 >
2012-12-08 12:02:45 +01:00
2010-01-27 21:23:14 +01:00
2007-11-25 18:35:11 +01:00
2010-04-08 15:59:16 +02:00
2010-04-08 15:30:47 +02:00
2012-11-10 14:04:08 +01:00
2010-09-25 15:22:51 +02:00
2012-11-14 12:27:49 +01:00
2012-12-06 14:30:44 -08:00
2012-11-30 13:44:04 -08:00
2011-11-16 21:05:30 +01:00
2012-07-08 22:15:08 +02:00
2012-09-01 14:58:24 +02:00
2012-09-01 14:58:24 +02:00
2012-09-01 14:58:24 +02:00
2012-09-01 14:58:24 +02:00
2012-05-25 09:15:10 +02:00
2012-09-01 14:58:24 +02:00
2012-05-15 08:31:30 +02:00
2012-05-15 08:31:30 +02:00
2012-05-15 08:31:30 +02:00
2012-05-15 08:31:30 +02:00
2012-05-15 08:31:30 +02:00
2012-09-01 14:58:24 +02:00
2012-09-21 23:51:29 +02:00
2012-11-06 22:24:11 +01:00
2012-07-10 11:35:39 +02:00
2012-11-10 08:15:40 +01:00
2011-10-13 12:26:30 +02:00
2012-11-30 13:44:04 -08:00
2011-09-06 08:43:35 +02:00
2011-08-04 22:55:35 +02:00
2011-11-10 23:27:28 +01:00
2012-10-16 12:35:11 +02:00
2010-10-22 00:05:05 +02:00
2012-09-04 17:05:39 -07:00
2012-05-25 09:15:09 +02:00
2009-02-24 10:00:28 +01:00
2011-11-15 23:58:26 +01:00
2011-08-04 23:34:02 +02:00
2011-08-04 23:34:02 +02:00
2009-02-11 23:03:41 +01:00
2011-11-07 22:09:58 +01:00
2011-04-28 21:31:02 +02:00
05a860c228