Merge commit 'v3.1-rc4' into next

2011-09-07 14:18:36 -07:00
parent d3654d7ef3 c6a389f123
commit 7e66eaf14e
8811 changed files with 538144 additions and 391624 deletions
--- a/include/linux/input.h
+++ b/include/linux/input.h
@@ -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