Merge branch 'kernel-test' into seventeen
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Oct 2014 10:00:34 +0000 (12:00 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 24 Oct 2014 10:00:34 +0000 (12:00 +0200)
1  2 
config/rootfiles/common/i586/linux
config/rootfiles/packages/linux-pae
lfs/linux
make.sh

Simple merge
Simple merge
diff --cc lfs/linux
Simple merge
diff --cc make.sh
Simple merge