Merge commit 'origin/master'

[linux-2.6-block.git] / Makefile

diff --git a/Makefile b/Makefile
index 5efdd88db85037419b16e0e52d6fb8fa8ef02106..8a2a275be304113f65016501efbf040fa69b144f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,4 @@
+FRED=42
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 26