Merge remote-tracking branch 'origin/seventeen' into kernel-test-next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 31 Oct 2014 16:32:58 +0000 (17:32 +0100)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 31 Oct 2014 16:32:58 +0000 (17:32 +0100)
1  2 
make.sh

diff --cc make.sh
Simple merge