Merge 4.4-rc6 into usb-next

We want the USB and PHY fixes in here as well to make things easier for
testing and development.

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

1 files changed, 1 insertions, 1 deletions

diff --git a/include/linux/platform_data/edma.h b/include/linux/platform_data/edma.h
index e2878baeb90e..4299f4ba03bd 100644
--- a/include/linux/platform_data/edma.h
+++ b/include/linux/platform_data/edma.h
@@ -72,7 +72,7 @@ struct edma_soc_info {
         struct edma_rsv_info    *rsv;
 
         /* List of channels allocated for memcpy, terminated with -1 */
-        s16                     *memcpy_channels;
+        s32                     *memcpy_channels;
 
         s8      (*queue_priority_mapping)[2];
         const s16       (*xbar_chans)[2];