git.ipfire.org Git - ipfire-2.x.git/commit - config/kernel/kernel.config.armv5tel-ipfire-kirkwood

]> git.ipfire.org Git - ipfire-2.x.git/commit - config/kernel/kernel.config.armv5tel-ipfire-kirkwood

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 17 Feb 2016 18:45:08 +0000 (19:45 +0100)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Wed, 17 Feb 2016 18:47:50 +0000 (19:47 +0100)
commit	802b916d10aa314ae878ec633e7c3bbd2adaba7e
tree	dfeda839c91fbc7b449b864c3e0b9d39bf37535d	tree \| snapshot
parent	879458d41f95578cd35e0f8e9f9e5078aa8dccbb	commit \| diff
parent	1ffbca6e4f3fdb0fbde2e725ba066877cb7f909e	commit \| diff

Merge remote-tracking branch 'origin/master' into next

Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
Conflicts:
make.sh

IPFire 2.x development tree

config/rootfiles/core/99/exclude	diff1 \|	diff2 \|	blob \| history
config/rootfiles/oldcore/98/exclude	\|	\|	blob
config/rootfiles/oldcore/98/filelists/armv5tel/glibc	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/98/filelists/files	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/98/filelists/i586/glibc	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/98/filelists/x86_64/glibc	\|	diff2 \|	blob \| history
config/rootfiles/oldcore/98/meta	\|	\|	blob
config/rootfiles/oldcore/98/update.sh	\|	diff2 \|	blob \| history
lfs/glibc	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history