Merge branches 'for-4.5/upstream-fixes', 'for-4.6/cmedia', 'for-4.6/i2c-hid', 'for...

diff --cc drivers/hid/hid-core.c
Simple merge

diff --cc drivers/hid/hid-ids.h
Simple merge

diff --cc drivers/hid/hid-multitouch.c
Simple merge

diff --cc drivers/hid/hid-sony.c
index 9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,ccf7ef2d0b5e61ee12a306a0059630efa8d1886c,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d,0b5015fd864a7ef3d28fb9ced0cf54bec18e7778,9b8db0e0ef1cdd6c3b2b050d87a50cb32e18ce1d..310436a54a3f308157a272d56d6624c3dd3c98c1
--- 1/drivers/hid/hid-sony.c
--- 2/drivers/hid/hid-sony.c
--- 3/drivers/hid/hid-sony.c
--- 4/drivers/hid/hid-sony.c
--- 5/drivers/hid/hid-sony.c
--- 6/drivers/hid/hid-sony.c
--- 7/drivers/hid/hid-sony.c
--- 8/drivers/hid/hid-sony.c
--- 9/drivers/hid/hid-sony.c
--- 10/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@@@@@@@@@@ -249,9 -249,9 -249,9 -249,9 -249,9 -249,9 -250,9 -249,9 -249,9 -249,9 +250,9 @@@@@@@@@@@ static u8 motion_rdesc[] = 
          };
          
          /* PS/3 Navigation controller */
------ ---static __u8 navigation_rdesc[] = {
++++++ +++static u8 navigation_rdesc[] = {
                0x05, 0x01,         /*  Usage Page (Desktop),               */
-------- -      0x09, 0x04,         /*  Usage (Joystik),                    */
++++++++ +      0x09, 0x04,         /*  Usage (Joystick),                   */
                0xA1, 0x01,         /*  Collection (Application),           */
                0xA1, 0x02,         /*      Collection (Logical),           */
                0x85, 0x01,         /*          Report ID (1),              */