Merge branch 'master' into net-next

115b4d88 · Stephen Hemminger · 1e5aa990 · 6720ecef · 115b4d88
Commit 115b4d88 authored Nov 03, 2015 by Stephen Hemminger
Show 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[] = "150831";
+static const char SNAPSHOT[] = "151103";