Merge 3.7-rc3 into usb-next.

This pulls in all of the USB changes in 3.7-rc3 into usb-next and
resolves the merge issue with:
	drivers/usb/misc/ezusb.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index d492a23df99c..ea1b1df5dbb0 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -192,7 +192,7 @@ int mod_verify_sig(const void *mod, unsigned long *_modlen)
         size_t modlen = *_modlen, sig_len;
         int ret;
 
-        pr_devel("==>%s(,%lu)\n", __func__, modlen);
+        pr_devel("==>%s(,%zu)\n", __func__, modlen);
 
         if (modlen <= sizeof(ms))
                 return -EBADMSG;