Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

All merge conflicts were simple overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

1 files changed, 1 insertions, 1 deletions

diff --git a/staging/mausezahn.c b/staging/mausezahn.c
index 8b2c499..0c0296e 100644
--- a/staging/mausezahn.c
+++ b/staging/mausezahn.c
@@ -209,7 +209,7 @@ int reset()
    fp2 = NULL;
    mz_port = 0;
    mz_rand = 0;
-   char mz_listen_addr[15] = "0.0.0.0";
+   char mz_listen_addr[16] = "0.0.0.0";
    mp_head = NULL;
 
    for (i=0;i<TIME_COUNT_MAX;i++) jitter[i] = 0;