From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 3 Dec 2011 10:10:01 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into arm-port
X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fipfire-3.x.git;a=commitdiff_plain;h=30aa3f70f6640c34f15ae4063ff3e9e967a8239d

Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x into arm-port

Conflicts:
	kernel/kernel.nm
---

30aa3f70f6640c34f15ae4063ff3e9e967a8239d
diff --cc kernel/kernel.nm
index 5707ce024,f4399a42e..67a98bd14
--- a/kernel/kernel.nm
+++ b/kernel/kernel.nm
@@@ -4,8 -4,8 +4,8 @@@
  ###############################################################################
  
  name       = kernel
- version    = 3.1.1
+ version    = 3.1.4
 -release    = 1
 +release    = 2
  thisapp    = linux-%{version}
  
  maintainer = Michael Tremer <michael.tremer@ipfire.org>