Merge tag 'v4.4-rc6' into devel

Linux 4.4-rc6
2015-12-21 09:36:21 +01:00
parent a9f1a3e4c1 4ef7675344
commit 0529357f10
1309 changed files with 16411 additions and 11961 deletions
--- 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];