Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next

diff --cc drivers/hid/hid-sony.c
index 8dcea693129503e8d6253c49e3c97601f4440cc3,ccf7ef2d0b5e61ee12a306a0059630efa8d1886c,0b5015fd864a7ef3d28fb9ced0cf54bec18e7778..310436a54a3f308157a272d56d6624c3dd3c98c1
--- 1/drivers/hid/hid-sony.c
--- 2/drivers/hid/hid-sony.c
--- 3/drivers/hid/hid-sony.c
+++ b/drivers/hid/hid-sony.c
@@@@ -250,9 -250,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),              */