Merge branch 'linux-2.6'

2026-09-24 18:16:04 +00:00 · 2008-03-13 15:26:33 +11:00 · 2008-03-13 15:26:33 +11:00 · bed04a4413
commit bed04a4413
parent e37c772e36 c463be3520
965 changed files with 20138 additions and 15110 deletions
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/cgroup_subsys.h
+++ b/include/linux/cgroup_subsys.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
--- a/include/linux/debugfs.h
+++ b/include/linux/debugfs.h
--- a/include/linux/delay.h
+++ b/include/linux/delay.h
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
--- a/include/linux/elfcore-compat.h
+++ b/include/linux/elfcore-compat.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/ext4_fs_extents.h
+++ b/include/linux/ext4_fs_extents.h
--- a/include/linux/firmware.h
+++ b/include/linux/firmware.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/gpio.h
+++ b/include/linux/gpio.h
--- a/include/linux/hardirq.h
+++ b/include/linux/hardirq.h
--- a/include/linux/iommu-helper.h
+++ b/include/linux/iommu-helper.h
--- a/include/linux/kprobes.h
+++ b/include/linux/kprobes.h
--- a/include/linux/kvm.h
+++ b/include/linux/kvm.h
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
--- a/include/linux/maple.h
+++ b/include/linux/maple.h
--- a/include/linux/marker.h
+++ b/include/linux/marker.h
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
--- a/include/linux/memstick.h
+++ b/include/linux/memstick.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
--- a/include/linux/netfilter/nfnetlink_compat.h
+++ b/include/linux/netfilter/nfnetlink_compat.h
--- a/include/linux/netpoll.h
+++ b/include/linux/netpoll.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/pmu.h
+++ b/include/linux/pmu.h
--- a/include/linux/proc_fs.h
+++ b/include/linux/proc_fs.h
--- a/include/linux/raid/bitmap.h
+++ b/include/linux/raid/bitmap.h
--- a/include/linux/raid/md_k.h
+++ b/include/linux/raid/md_k.h
--- a/include/linux/rcuclassic.h
+++ b/include/linux/rcuclassic.h
--- a/include/linux/rcupreempt.h
+++ b/include/linux/rcupreempt.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/serial_sci.h
+++ b/include/linux/serial_sci.h
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
--- a/include/linux/sm501-regs.h
+++ b/include/linux/sm501-regs.h
--- a/include/linux/sm501.h
+++ b/include/linux/sm501.h
--- a/include/linux/tifm.h
+++ b/include/linux/tifm.h
--- a/include/linux/time.h
+++ b/include/linux/time.h
--- a/include/linux/timex.h
+++ b/include/linux/timex.h
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
--- a/include/linux/usb/Kbuild
+++ b/include/linux/usb/Kbuild
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
--- a/include/linux/vmstat.h
+++ b/include/linux/vmstat.h