Merge branch 'master' into net-next

165303e5 · Stephen Hemminger · 0cfb9f6a · 162b3ce9 · 165303e5
Commit 165303e5 authored Mar 14, 2016 by Stephen Hemminger
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

include/SNAPSHOT.h include/SNAPSHOT.h +1 -1

No files found.
--- a/include/SNAPSHOT.h
+++ b/include/SNAPSHOT.h
-static const char SNAPSHOT[] = "160111";
+static const char SNAPSHOT[] = "160314";