Merge mulgrave-w:git/linux-2.6

Conflicts: include/linux/blkdev.h Trivial merge to incorporate tag prototypes.
2026-09-22 18:22:42 +00:00 · 2006-09-23 21:03:52 -05:00 · 2006-09-23 21:03:52 -05:00 · 1aedf2ccc6
commit 1aedf2ccc6
parent dfdc58ba35 1ab9dd0902
628 changed files with 33028 additions and 15465 deletions
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/dccp.h
+++ b/include/linux/dccp.h
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.h
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
--- a/include/linux/if.h
+++ b/include/linux/if.h
--- a/include/linux/if_addr.h
+++ b/include/linux/if_addr.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/ip.h
+++ b/include/linux/ip.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/neighbour.h
+++ b/include/linux/neighbour.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/nf_conntrack_common.h
+++ b/include/linux/netfilter/nf_conntrack_common.h
--- a/include/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/linux/netfilter/nf_conntrack_tcp.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_DSCP.h
+++ b/include/linux/netfilter/xt_DSCP.h
--- a/include/linux/netfilter/xt_dscp.h
+++ b/include/linux/netfilter/xt_dscp.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_ipv4/ip_conntrack_helper.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_proto_gre.h
--- a/include/linux/netfilter_ipv4/ip_nat.h
+++ b/include/linux/netfilter_ipv4/ip_nat.h
--- a/include/linux/netfilter_ipv4/ip_nat_core.h
+++ b/include/linux/netfilter_ipv4/ip_nat_core.h
--- a/include/linux/netfilter_ipv4/ip_nat_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_nat_pptp.h
--- a/include/linux/netfilter_ipv4/ip_tables.h
+++ b/include/linux/netfilter_ipv4/ip_tables.h
--- a/include/linux/netfilter_ipv4/ipt_DSCP.h
+++ b/include/linux/netfilter_ipv4/ipt_DSCP.h
--- a/include/linux/netfilter_ipv4/ipt_dscp.h
+++ b/include/linux/netfilter_ipv4/ipt_dscp.h
--- a/include/linux/netfilter_ipv4/listhelp.h
+++ b/include/linux/netfilter_ipv4/listhelp.h
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
--- a/include/linux/netfilter_ipv6/ip6_tables.h
+++ b/include/linux/netfilter_ipv6/ip6_tables.h
--- a/include/linux/netfilter_logging.h
+++ b/include/linux/netfilter_logging.h
--- a/include/linux/nfs_fs.h
+++ b/include/linux/nfs_fs.h
--- a/include/linux/nfs_fs_sb.h
+++ b/include/linux/nfs_fs_sb.h
--- a/include/linux/nfs_idmap.h
+++ b/include/linux/nfs_idmap.h
--- a/include/linux/nfs_xdr.h
+++ b/include/linux/nfs_xdr.h
--- a/include/linux/pkt_cls.h
+++ b/include/linux/pkt_cls.h
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
--- a/include/linux/sunrpc/clnt.h
+++ b/include/linux/sunrpc/clnt.h
--- a/include/linux/sunrpc/rpc_pipe_fs.h
+++ b/include/linux/sunrpc/rpc_pipe_fs.h
--- a/include/linux/sunrpc/sched.h
+++ b/include/linux/sunrpc/sched.h
--- a/include/linux/sunrpc/xprt.h
+++ b/include/linux/sunrpc/xprt.h
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h