Merge remote-tracking branch 'origin/master' into next

This commit is contained in:
Arne Fitzenreiter
2014-05-21 22:47:13 +02:00
13 changed files with 761 additions and 47 deletions

View File

@@ -2243,6 +2243,7 @@ lib/modules/KVER-ipfire-kirkwood
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-kirkwood/kernel/net/sched/sch_qfq.ko

View File

@@ -2195,6 +2195,7 @@ lib/modules/KVER-ipfire-multi
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-multi/kernel/net/sched/sch_qfq.ko

View File

@@ -1804,6 +1804,7 @@ lib/modules/KVER-ipfire-rpi
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire-rpi/kernel/net/sched/sch_qfq.ko

View File

@@ -240,10 +240,25 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/drivers/clocksource/cs5535-clockevt.ko
#lib/modules/KVER-ipfire/kernel/drivers/clocksource/scx200_hrt.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/acpi-cpufreq.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/amd_freq_sensitivity.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq-nforce2.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_conservative.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_ondemand.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_powersave.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/cpufreq_stats.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/gx-suspmod.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longhaul.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/longrun.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/mperf.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/p4-clockmod.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/pcc-cpufreq.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k6.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k7.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/powernow-k8.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-ich.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-lib.ko
#lib/modules/KVER-ipfire/kernel/drivers/cpufreq/speedstep-smi.ko
#lib/modules/KVER-ipfire/kernel/drivers/crypto
#lib/modules/KVER-ipfire/kernel/drivers/crypto/geode-aes.ko
#lib/modules/KVER-ipfire/kernel/drivers/crypto/hifn_795x.ko
@@ -2663,6 +2678,7 @@ lib/modules/KVER-ipfire
#lib/modules/KVER-ipfire/kernel/net/sched/sch_mqprio.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_multiq.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_netem.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_pie.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_plug.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_prio.ko
#lib/modules/KVER-ipfire/kernel/net/sched/sch_qfq.ko