Merge with /home/sr/git/u-boot/denx

CHANGELOG

diff --git a/CHANGELOG b/CHANGELOG
index 9840863..786f01b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -8,6 +8,8 @@
 * Update NAND boot documentation
   Patch by Stefan Roese, 12 Sep 2006
 
+* Fix alignment problem in "mtdparts" command
+
 * Add documentation on the latest build environment extensions to
   the README file.
 

common/cmd_jffs2.c

diff --git a/common/cmd_jffs2.c b/common/cmd_jffs2.c
index 201c3c1..b5fd417 100644
--- a/common/cmd_jffs2.c
+++ b/common/cmd_jffs2.c
@@ -1268,7 +1268,7 @@
 		part_num = 0;
 		list_for_each(pentry, &dev->parts) {
 			part = list_entry(pentry, struct part_info, link);
-			printf(" %d: %-22s\t0x%08x\t0x%08x\t%d\n",
+			printf("%2d: %-20s0x%08x\t0x%08x\t%d\n",
 					part_num, part->name, part->size,
 					part->offset, part->mask_flags);