diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 19:58:56 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-12-15 19:58:56 +0100 |
| commit | 467a6756263bf3fc48110307cf68e111e5b4c841 (patch) | |
| tree | 2f48e8f0532d7173166d31ce43d640b93d8f59bb /commands | |
| parent | 29bf8c9a78483c331a77c66607e1be10045b2861 (diff) | |
| parent | 1aba5d366ccc1016c3c5ca8b10b10eca26c75db9 (diff) | |
| download | barebox-467a6756263bf3fc48110307cf68e111e5b4c841.tar.gz barebox-467a6756263bf3fc48110307cf68e111e5b4c841.tar.xz | |
Merge branch 'master' into next
Conflicts:
arch/arm/boards/usb-a926x/init.c
arch/arm/mach-pxa/include/mach/clock.h
arch/arm/mach-pxa/speed-pxa27x.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/commands/time.c b/commands/time.c index 9a769451aa..c2633bac77 100644 --- a/commands/time.c +++ b/commands/time.c @@ -10,7 +10,7 @@ static int do_time(struct command *cmdtp, int argc, char *argv[]) unsigned char *buf; u64 start, end, diff64; unsigned long diff; - int len = 0; + int len = 1; /* '\0' */ if (argc < 2) return COMMAND_ERROR_USAGE; |