Merge branch 'master' of /home/davem/src/GIT/linux-2.6/

Conflicts: include/linux/mod_devicetable.h scripts/mod/file2alias.c
2026-10-16 22:39:48 +00:00 · 2010-05-18 23:01:55 -07:00 · 2010-05-18 23:01:55 -07:00 · 2ec8c6bb5d
commit 2ec8c6bb5d
parent 7b39f90fab 537b60d178
577 changed files with 24542 additions and 14740 deletions
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
--- a/include/asm-generic/bitops/arch_hweight.h
+++ b/include/asm-generic/bitops/arch_hweight.h
--- a/include/asm-generic/bitops/const_hweight.h
+++ b/include/asm-generic/bitops/const_hweight.h
--- a/include/asm-generic/bitops/hweight.h
+++ b/include/asm-generic/bitops/hweight.h
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/debugobjects.h
+++ b/include/linux/debugobjects.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mod_devicetable.h
+++ b/include/linux/mod_devicetable.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/platform_device.h
+++ b/include/linux/platform_device.h
--- a/include/linux/ptrace.h
+++ b/include/linux/ptrace.h
--- a/include/linux/rbtree.h
+++ b/include/linux/rbtree.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/rcutiny.h
+++ b/include/linux/rcutiny.h
--- a/include/linux/rcutree.h
+++ b/include/linux/rcutree.h
--- a/include/linux/ring_buffer.h
+++ b/include/linux/ring_buffer.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/srcu.h
+++ b/include/linux/srcu.h
--- a/include/linux/stop_machine.h
+++ b/include/linux/stop_machine.h
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
--- a/include/linux/types.h
+++ b/include/linux/types.h
--- a/include/linux/wait.h
+++ b/include/linux/wait.h
--- a/include/linux/zorro.h
+++ b/include/linux/zorro.h
--- a/include/trace/define_trace.h
+++ b/include/trace/define_trace.h
--- a/include/trace/events/lock.h
+++ b/include/trace/events/lock.h
--- a/include/trace/events/module.h
+++ b/include/trace/events/module.h
--- a/include/trace/events/napi.h
+++ b/include/trace/events/napi.h
--- a/include/trace/events/sched.h
+++ b/include/trace/events/sched.h
--- a/include/trace/events/signal.h
+++ b/include/trace/events/signal.h
--- a/include/trace/ftrace.h
+++ b/include/trace/ftrace.h