Merge branch 'next' of git.ipfire.org:/pub/git/ipfire-2.x into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Fri, 28 Feb 2014 06:04:45 +0000 (07:04 +0100)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Fri, 28 Feb 2014 06:04:45 +0000 (07:04 +0100)
author Arne Fitzenreiter <arne_f@ipfire.org>
Fri, 28 Feb 2014 06:04:45 +0000 (07:04 +0100)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Fri, 28 Feb 2014 06:04:45 +0000 (07:04 +0100)
diff --cc config/kernel/kernel.config.armv5tel-ipfire-multi
Simple merge
diff --cc config/kernel/kernel.config.armv5tel-ipfire-rpi
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 28 Feb 2014 06:04:45 +0000 (07:04 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Fri, 28 Feb 2014 06:04:45 +0000 (07:04 +0100)
		1	2
config/kernel/kernel.config.armv5tel-ipfire-multi	patch \|	diff1 \|	diff2 \|	blob \| history
config/kernel/kernel.config.armv5tel-ipfire-rpi	patch \|	diff1 \|	diff2 \|	blob \| history