Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	drivers/net/wireless/b43/dma.c
	drivers/net/wireless/brcm80211/brcmfmac/dhd_linux.c

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/net/wireless/ath/ath6kl/debug.c b/drivers/net/wireless/ath/ath6kl/debug.c
index 9eff0d010bb..eb808b46f94 100644
--- a/drivers/net/wireless/ath/ath6kl/debug.c
+++ b/drivers/net/wireless/ath/ath6kl/debug.c
@@ -1551,10 +1551,10 @@ static ssize_t ath6kl_listen_int_read(struct file *file,
                                                 size_t count, loff_t *ppos)
 {
         struct ath6kl *ar = file->private_data;
-        char buf[16];
+        char buf[32];
         int len;
 
-        len = snprintf(buf, sizeof(buf), "%u %u\n", ar->listen_intvl_t,
+        len = scnprintf(buf, sizeof(buf), "%u %u\n", ar->listen_intvl_t,
                                         ar->listen_intvl_b);
 
         return simple_read_from_buffer(user_buf, count, ppos, buf, len);