Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/chr/carl9170fw

diff --combined tools/carlu/src/debug.c
index 3da9e651d3454cbfd1019965614f5b049dd01685,7ba573f396c5e68fdc20e319f89c62a335018b46..f8d6372c5afa184b39100a9bec55b32112f67152
--- 1/tools/carlu/src/debug.c
--- 2/tools/carlu/src/debug.c
+++ b/tools/carlu/src/debug.c
@@@ -1,9 -1,9 +1,9 @@@
  /*
-  * carl9170user - userspace testing utility for ar9170 devices
+  * carlu - userspace testing utility for ar9170 devices
   *
   * Random assortment of debug stuff
   *
-  * Copyright 2009, 2010 Christian Lamparter <chunkeey@googlemail.com>
+  * Copyright 2009-2011 Christian Lamparter <chunkeey@googlemail.com>
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License as published by
@@@ -73,7 -73,7 +73,7 @@@ void print_hex_dump_bytes(const enum de
        char str[17] = { 0 };
        const unsigned char *tmp = (void *) buf;
        char *pbuf = line;
 -      size_t i;
 +      size_t i, j;
  
        for (i = 0; i < len; i++) {
                if (i % 16 == 0) {
@@@ -92,7 -92,7 +92,7 @@@
                if ((i % 16)) {
                        str[i % 16] = '\0';
  
 -                      for (i = 0; i < (16 - (i % 16)); i++)
 +                      for (j = 0; j < (16 - (i % 16)); j++)
                                pbuf += sprintf(pbuf, "   ");
                }