diff options
| author | Stefano Babic <sbabic@denx.de> | 2012-12-08 12:02:45 +0100 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2012-12-08 12:02:45 +0100 |
| commit | 05a860c228fe6c8f2e7aced8cc8ef88bc1038363 (patch) | |
| tree | 764536da9202b9de387a0d957829f64dfba818b7 /doc/kwboot.1 | |
| parent | 393ff47ba3123208f7c4f08d63f114300a41d0c4 (diff) | |
| parent | fd4d564b3c80b111f18c93adb14233a6a7ddb0e9 (diff) | |
| download | blackbird-obmc-uboot-05a860c228fe6c8f2e7aced8cc8ef88bc1038363.tar.gz blackbird-obmc-uboot-05a860c228fe6c8f2e7aced8cc8ef88bc1038363.zip | |
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>
Diffstat (limited to 'doc/kwboot.1')
| -rw-r--r-- | doc/kwboot.1 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/kwboot.1 b/doc/kwboot.1 index ed0839836e..25fe69aa5c 100644 --- a/doc/kwboot.1 +++ b/doc/kwboot.1 @@ -79,6 +79,6 @@ Adjust the baud rate on \fITTY\fP. Default rate is 115200. Daniel Stodden <daniel.stodden@gmail.com> .br -Luka Perkov <uboot@lukaperkov.net> +Luka Perkov <luka@openwrt.org> .br David Purdy <david.c.purdy@gmail.com> |
