summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Beisert <jbe@pengutronix.de>2007-11-12 15:29:13 +0100
committerJuergen Beisert <jbe@pengutronix.de>2007-11-12 15:29:13 +0100
commitfcfd25606c7387a3e0e9c6d85aca88d97159ae70 (patch)
tree0c76a3404407624d1dc1fa25f538f63f55b7cf52
parentb2c4402b94fd3b5b6cc16e64252b11c366337710 (diff)
parentc991486d56ed0ff3e7ccc0c8a57ac71629ac182f (diff)
downloadbarebox-fcfd25606c7387a3e0e9c6d85aca88d97159ae70.tar.gz
barebox-fcfd25606c7387a3e0e9c6d85aca88d97159ae70.tar.xz
Merge branch 'master' of /home/git/projects/u-boot-v2/
-rw-r--r--commands/bootm.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/bootm.c b/commands/bootm.c
index 755d3a962b..dcfe98b4a8 100644
--- a/commands/bootm.c
+++ b/commands/bootm.c
@@ -869,4 +869,4 @@ do_bootm_lynxkdi (cmd_tbl_t *cmdtp,
* - @subpage arm_boot_preparation
* - @subpage ppc_boot_preparation
* - @subpage x86_boot_preparation
- */ \ No newline at end of file
+ */