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 9b8db0e,9b8db0e,9b8db0e,9b8db0e,9b8db0e,9b8db0e,ccf7ef2,9b8db0e,0b5015f,9b8db0e..310436a
--- 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),              */