Merge remote-tracking branch 'origin/kernel-update' into glibc-update2
authorMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Aug 2012 20:34:23 +0000 (16:34 -0400)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 13 Aug 2012 20:34:23 +0000 (16:34 -0400)
1  2 
make.sh

diff --cc make.sh
Simple merge