Merge tag 'v4.3-rc3' into next
authorDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 29 Sep 2015 23:28:52 +0000 (16:28 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Tue, 29 Sep 2015 23:28:52 +0000 (16:28 -0700)
Merge with Linux 4.3-rc3 to bring in MFD DA9062 changes to merge DA9062
OnKey driver.

1  2 
arch/arm/boot/dts/am437x-sk-evm.dts
arch/arm/boot/dts/imx6qdl-tx6.dtsi
drivers/input/joystick/turbografx.c

Simple merge
Simple merge
@@@ -205,8 -196,9 +205,8 @@@ static void tgfx_attach(struct parport 
                if (n_buttons[i] < 1)
                        continue;
  
-               if (n_buttons[i] > 6) {
+               if (n_buttons[i] > ARRAY_SIZE(tgfx_buttons)) {
                        printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
 -                      err = -EINVAL;
                        goto err_unreg_devs;
                }