Merge branch 'master' into next

author Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 4 Aug 2010 19:20:10 +0000 (21:20 +0200)

committer Arne Fitzenreiter <arne_f@ipfire.org>

Wed, 4 Aug 2010 19:20:10 +0000 (21:20 +0200)
author Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 Aug 2010 19:20:10 +0000 (21:20 +0200)
committer Arne Fitzenreiter <arne_f@ipfire.org>
Wed, 4 Aug 2010 19:20:10 +0000 (21:20 +0200)
diff --cc lfs/linux
Simple merge
diff --cc make.sh
Simple merge
author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 4 Aug 2010 19:20:10 +0000 (21:20 +0200)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 4 Aug 2010 19:20:10 +0000 (21:20 +0200)
		1	2
lfs/linux	patch \|	diff1 \|	diff2 \|	blob \| history
make.sh	patch \|	diff1 \|	diff2 \|	blob \| history