Merge commit 'v3.1-rc4' into next
This commit is contained in:
commit
7e66eaf14e
8811 changed files with 538144 additions and 391624 deletions
|
@ -438,6 +438,8 @@ struct input_keymap_entry {
|
|||
#define KEY_WIMAX 246
|
||||
#define KEY_RFKILL 247 /* Key that controls all radios */
|
||||
|
||||
#define KEY_MICMUTE 248 /* Mute / unmute the microphone */
|
||||
|
||||
/* Code 255 is reserved for special needs of AT keyboard driver */
|
||||
|
||||
#define BTN_MISC 0x100
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue