Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc...
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Aug 2012 10:12:20 +0000 (12:12 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Aug 2012 10:12:20 +0000 (12:12 +0200)
1  2 
make.sh

diff --cc make.sh
Simple merge