Pick up the latest fixes, refresh the development tree.
Showing the changes to include/uapi/linux (2 of 565 files). Show all
Unified · Split
| @@ -464,7 +464,8 @@ struct input_keymap_entry { · 463 unmodified lines | ||
| 464 | 464 | #define KEY_BRIGHTNESS_ZERO 244 /* brightness off, use ambient */ |
| 465 | 465 | #define KEY_DISPLAY_OFF 245 /* display device to off state */ |
| 466 | 466 | |
| 467 | −#define KEY_WIMAX 246 | |
| 467 | +#define KEY_WWAN 246 /* Wireless WAN (LTE, UMTS, GSM, etc.) */ | |
| 468 | +#define KEY_WIMAX KEY_WWAN | |
| 468 | 469 | #define KEY_RFKILL 247 /* Key that controls all radios */ |
| 469 | 470 | |
| 470 | 471 | #define KEY_MICMUTE 248 /* Mute / unmute the microphone */ |
| @@ -679,6 +679,7 @@ enum perf_event_type { · 678 unmodified lines | ||
| 679 | 679 | * |
| 680 | 680 | * { u64 weight; } && PERF_SAMPLE_WEIGHT |
| 681 | 681 | * { u64 data_src; } && PERF_SAMPLE_DATA_SRC |
| 682 | + * { u64 transaction; } && PERF_SAMPLE_TRANSACTION | |
| 682 | 683 | * }; |
| 683 | 684 | */ |
| 684 | 685 | PERF_RECORD_SAMPLE = 9, |