Merge branch 'linux-2.6' into for-linus

2026-09-18 18:15:59 +00:00 · 2006-12-04 15:59:07 +11:00 · 2006-12-04 15:59:07 +11:00 · 79acbb3ff2
commit 79acbb3ff2
parent 19a79859e1 2b5f6dcce5
2679 changed files with 98323 additions and 41494 deletions
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/atmarp.h
+++ b/include/linux/atmarp.h
--- a/include/linux/atmbr2684.h
+++ b/include/linux/atmbr2684.h
--- a/include/linux/atmmpc.h
+++ b/include/linux/atmmpc.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/blktrace_api.h
+++ b/include/linux/blktrace_api.h
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
--- a/include/linux/compat.h
+++ b/include/linux/compat.h
--- a/include/linux/compat_ioctl.h
+++ b/include/linux/compat_ioctl.h
--- a/include/linux/crypto.h
+++ b/include/linux/crypto.h
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/divert.h
+++ b/include/linux/divert.h
--- a/include/linux/dmi.h
+++ b/include/linux/dmi.h
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/htirq.h
+++ b/include/linux/htirq.h
--- a/include/linux/hugetlb.h
+++ b/include/linux/hugetlb.h
--- a/include/linux/icmp.h
+++ b/include/linux/icmp.h
--- a/include/linux/icmpv6.h
+++ b/include/linux/icmpv6.h
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
--- a/include/linux/igmp.h
+++ b/include/linux/igmp.h
--- a/include/linux/in.h
+++ b/include/linux/in.h
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
--- a/include/linux/inet.h
+++ b/include/linux/inet.h
--- a/include/linux/inetdevice.h
+++ b/include/linux/inetdevice.h
--- a/include/linux/init.h
+++ b/include/linux/init.h
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
--- a/include/linux/ip.h
+++ b/include/linux/ip.h
--- a/include/linux/ip6_tunnel.h
+++ b/include/linux/ip6_tunnel.h
--- a/include/linux/ipmi_msgdefs.h
+++ b/include/linux/ipmi_msgdefs.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/ipx.h
+++ b/include/linux/ipx.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/ixjuser.h
+++ b/include/linux/ixjuser.h
--- a/include/linux/jiffies.h
+++ b/include/linux/jiffies.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/kexec.h
+++ b/include/linux/kexec.h
--- a/include/linux/kobject.h
+++ b/include/linux/kobject.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/lockd/bind.h
+++ b/include/linux/lockd/bind.h
--- a/include/linux/lockd/lockd.h
+++ b/include/linux/lockd/lockd.h
--- a/include/linux/lockd/share.h
+++ b/include/linux/lockd/share.h
--- a/include/linux/lockd/xdr.h
+++ b/include/linux/lockd/xdr.h
--- a/include/linux/lockd/xdr4.h
+++ b/include/linux/lockd/xdr4.h
--- a/include/linux/lockdep.h
+++ b/include/linux/lockdep.h
--- a/include/linux/mempolicy.h
+++ b/include/linux/mempolicy.h
--- a/include/linux/miscdevice.h
+++ b/include/linux/miscdevice.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
--- a/include/linux/mmc/protocol.h
+++ b/include/linux/mmc/protocol.h
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
--- a/include/linux/mqueue.h
+++ b/include/linux/mqueue.h
--- a/include/linux/msdos_fs.h
+++ b/include/linux/msdos_fs.h
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
--- a/include/linux/mv643xx.h
+++ b/include/linux/mv643xx.h
--- a/include/linux/net.h
+++ b/include/linux/net.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter.h
+++ b/include/linux/netfilter.h
--- a/include/linux/netfilter/Kbuild
+++ b/include/linux/netfilter/Kbuild
--- a/include/linux/netfilter/nf_conntrack_amanda.h
+++ b/include/linux/netfilter/nf_conntrack_amanda.h
--- a/include/linux/netfilter/nf_conntrack_ftp.h
+++ b/include/linux/netfilter/nf_conntrack_ftp.h
--- a/include/linux/netfilter/nf_conntrack_h323.h
+++ b/include/linux/netfilter/nf_conntrack_h323.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_asn1.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper_h323_types.h
--- a/include/linux/netfilter/nf_conntrack_irc.h
+++ b/include/linux/netfilter/nf_conntrack_irc.h
--- a/include/linux/netfilter/nf_conntrack_pptp.h
+++ b/include/linux/netfilter/nf_conntrack_pptp.h
--- a/include/linux/netfilter/nf_conntrack_proto_gre.h
+++ b/include/linux/netfilter/nf_conntrack_proto_gre.h
--- a/include/linux/netfilter/nf_conntrack_sctp.h
+++ b/include/linux/netfilter/nf_conntrack_sctp.h
--- a/include/linux/netfilter/nf_conntrack_sip.h
+++ b/include/linux/netfilter/nf_conntrack_sip.h
--- a/include/linux/netfilter/nf_conntrack_tftp.h
+++ b/include/linux/netfilter/nf_conntrack_tftp.h
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
--- a/include/linux/netfilter/nfnetlink_log.h
+++ b/include/linux/netfilter/nfnetlink_log.h
--- a/include/linux/netfilter/nfnetlink_queue.h
+++ b/include/linux/netfilter/nfnetlink_queue.h
--- a/include/linux/netfilter/x_tables.h
+++ b/include/linux/netfilter/x_tables.h
--- a/include/linux/netfilter/xt_NFLOG.h
+++ b/include/linux/netfilter/xt_NFLOG.h
--- a/include/linux/netfilter/xt_conntrack.h
+++ b/include/linux/netfilter/xt_conntrack.h
--- a/include/linux/netfilter/xt_hashlimit.h
+++ b/include/linux/netfilter/xt_hashlimit.h
--- a/include/linux/netfilter/xt_policy.h
+++ b/include/linux/netfilter/xt_policy.h
--- a/include/linux/netfilter_arp/arp_tables.h
+++ b/include/linux/netfilter_arp/arp_tables.h
--- a/include/linux/netfilter_bridge.h
+++ b/include/linux/netfilter_bridge.h
--- a/include/linux/netfilter_bridge/ebt_802_3.h
+++ b/include/linux/netfilter_bridge/ebt_802_3.h
--- a/include/linux/netfilter_bridge/ebt_among.h
+++ b/include/linux/netfilter_bridge/ebt_among.h
--- a/include/linux/netfilter_bridge/ebt_arp.h
+++ b/include/linux/netfilter_bridge/ebt_arp.h
--- a/include/linux/netfilter_bridge/ebt_ip.h
+++ b/include/linux/netfilter_bridge/ebt_ip.h
--- a/include/linux/netfilter_bridge/ebt_nat.h
+++ b/include/linux/netfilter_bridge/ebt_nat.h
--- a/include/linux/netfilter_bridge/ebt_vlan.h
+++ b/include/linux/netfilter_bridge/ebt_vlan.h
--- a/include/linux/netfilter_bridge/ebtables.h
+++ b/include/linux/netfilter_bridge/ebtables.h
--- a/include/linux/netfilter_ipv4.h
+++ b/include/linux/netfilter_ipv4.h
--- a/include/linux/netfilter_ipv4/Kbuild
+++ b/include/linux/netfilter_ipv4/Kbuild
--- a/include/linux/netfilter_ipv4/ip_conntrack.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_ftp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_h323.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_h323.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
--- a/Show more
+++ b/Show more