Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts: drivers/net/Kconfig
2026-09-26 18:16:26 +00:00 · 2009-02-03 00:15:35 -08:00 · 2009-02-03 00:15:35 -08:00 · b3ff29d2cc
commit b3ff29d2cc
parent 1bded710a5 fb53fde976
583 changed files with 14349 additions and 6064 deletions
--- a/kernel/cgroup.c
+++ b/kernel/cgroup.c
--- a/kernel/cpuset.c
+++ b/kernel/cpuset.c
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
--- a/kernel/module.c
+++ b/kernel/module.c
--- a/kernel/power/disk.c
+++ b/kernel/power/disk.c
--- a/kernel/sched.c
+++ b/kernel/sched.c
--- a/kernel/sched_fair.c
+++ b/kernel/sched_fair.c
--- a/kernel/sched_rt.c
+++ b/kernel/sched_rt.c
--- a/kernel/signal.c
+++ b/kernel/signal.c
--- a/kernel/smp.c
+++ b/kernel/smp.c
--- a/kernel/time/tick-common.c
+++ b/kernel/time/tick-common.c
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
--- a/kernel/trace/trace_irqsoff.c
+++ b/kernel/trace/trace_irqsoff.c
--- a/kernel/trace/trace_sched_wakeup.c
+++ b/kernel/trace/trace_sched_wakeup.c