From: Arne Fitzenreiter Date: Tue, 17 Mar 2015 13:05:56 +0000 (+0100) Subject: Merge branch 'master' into next X-Git-Tag: v2.17-core91~163^2~6 X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=c98cc4ae90643b9a43431be5de7d821c110267c0 Merge branch 'master' into next --- c98cc4ae90643b9a43431be5de7d821c110267c0 diff --cc config/rootfiles/common/armv5tel/initscripts index 05b8ceebe8,52487669ae..8ddf34ae87 mode 100755,100644..100644 --- a/config/rootfiles/common/armv5tel/initscripts +++ b/config/rootfiles/common/armv5tel/initscripts diff --cc config/rootfiles/common/i586/initscripts index d4779ab054,845ae504b3..3d4dd62ff0 mode 100755,100644..100644 --- a/config/rootfiles/common/i586/initscripts +++ b/config/rootfiles/common/i586/initscripts