Merge commit 'v2.6.32' into next

This commit is contained in:
Dmitry Torokhov
2009-12-02 23:38:13 -08:00
799 changed files with 13347 additions and 6187 deletions

View File

@ -1262,7 +1262,7 @@ static void kbd_keycode(unsigned int keycode, int down, int hw_raw)
if (keycode >= NR_KEYS)
if (keycode >= KEY_BRL_DOT1 && keycode <= KEY_BRL_DOT8)
keysym = K(KT_BRL, keycode - KEY_BRL_DOT1 + 1);
keysym = U(K(KT_BRL, keycode - KEY_BRL_DOT1 + 1));
else
return;
else