History

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

David S. Miller committed 12 years ago

Commit 9b8d90b2 parents 644a918 d7933ab697 files · +9694 −5683Browse files

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

Unified · Split

include/uapi/linux/perf_event.h+1−0
@@ -705,6 +705,7 @@ enum perf_event_type { · 704 unmodified lines
705 * u32 min;705 * u32 min;
706 * u64 ino;706 * u64 ino;
707 * u64 ino_generation;707 * u64 ino_generation;
708 * u32 prot, flags;
708 * char filename[];709 * char filename[];
709 * struct sample_id sample_id;710 * struct sample_id sample_id;
710 * };711 * };