git.ipfire.org Git - ipfire-2.x.git/commit - make.sh

]> git.ipfire.org Git - ipfire-2.x.git/commit - make.sh

projects / ipfire-2.x.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8e6fb99 dc652b8)

author	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 17 Sep 2011 22:33:41 +0000 (22:33 +0000)
committer	Arne Fitzenreiter <arne_f@ipfire.org>
	Sat, 17 Sep 2011 22:33:41 +0000 (22:33 +0000)
commit	38becfffb894e9daa239daab7162886892c4e8b4
tree	0550caeb1f296781d13f9644d84043726d6b9e04	tree \| snapshot
parent	8e6fb99d97158f35f515f8478e26924eea56451c	commit \| diff
parent	dc652b880b1f0c0140674e33caa21a75f0a2fc10	commit \| diff

Merge branch 'arm-port' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x into arm-port

Conflicts:
lfs/linux

config/kernel/kernel.config.armv5tel-ipfire	diff1 \|	diff2 \|	blob \| history
lfs/linux	diff1 \|	diff2 \|	blob \| history
make.sh	diff1 \|	diff2 \|	blob \| history

IPFire 2.x development tree