History

Merge v3.13-rc6 into char-misc-next

We want these fixes in here as well.

Greg Kroah-Hartman committed 12 years ago

Commit dde86f42 parents 3b2c67d 802eee9288 files · +2784 −1399Browse files

Showing the changes to include/uapi/linux (1 of 288 files). Show all

Unified · Split

include/uapi/linux/perf_event.h+1−0
@@ -679,6 +679,7 @@ enum perf_event_type { · 678 unmodified lines
679679 *
680680 * { u64 weight; } && PERF_SAMPLE_WEIGHT
681681 * { u64 data_src; } && PERF_SAMPLE_DATA_SRC
682+ * { u64 transaction; } && PERF_SAMPLE_TRANSACTION
682683 * };
683684 */
684685 PERF_RECORD_SAMPLE = 9,