Merge branch 'next-samsung' into for-next

Conflicts:
	arch/arm/mach-s5p6440/Kconfig
	arch/arm/mach-s5p6442/Kconfig
	arch/arm/mach-s5pc100/Kconfig
	arch/arm/mach-s5pv210/Kconfig
	arch/arm/mach-s5pv210/cpu.c
	arch/arm/plat-samsung/include/plat/sdhci.h

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/char/keyboard.c b/drivers/char/keyboard.c
index 54109dc9240c..25be2102a60a 100644
--- a/drivers/char/keyboard.c
+++ b/drivers/char/keyboard.c
@@ -1315,10 +1315,14 @@ static bool kbd_match(struct input_handler *handler, struct input_dev *dev)
         if (test_bit(EV_SND, dev->evbit))
                 return true;
 
-        if (test_bit(EV_KEY, dev->evbit))
+        if (test_bit(EV_KEY, dev->evbit)) {
                 for (i = KEY_RESERVED; i < BTN_MISC; i++)
                         if (test_bit(i, dev->keybit))
                                 return true;
+                for (i = KEY_BRL_DOT1; i <= KEY_BRL_DOT10; i++)
+                        if (test_bit(i, dev->keybit))
+                                return true;
+        }
 
         return false;
 }