Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2014-06-25 22:40:43 -07:00
parent 644a918d20 d7933ab727
commit 9b8d90b963
697 changed files with 9738 additions and 5727 deletions
--- a/include/uapi/linux/perf_event.h
+++ b/include/uapi/linux/perf_event.h
@@ -705,6 +705,7 @@ enum perf_event_type {
 	 *	u32				min;
 	 *	u64				ino;
 	 *	u64				ino_generation;
+	 *	u32				prot, flags;
 	 *	char				filename[];
 	 * 	struct sample_id		sample_id;
 	 * };