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

Conflicts:
	kernel/kernel.nm

diff --cc kernel/kernel.nm
index 5707ce024418a241055c3027de53357b5439cbcf,f4399a42e7d86f9bc0349a31c670b1dcc0972391..67a98bd149dc00c6d6d3bea206aec1bfd1030cd1
--- 1/kernel/kernel.nm
--- 2/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>