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

Conflicts: drivers/mtd/Kconfig Signed-off-by: David Woodhouse <dwmw2@infradead.org>
2026-09-22 18:22:42 +00:00 · 2007-04-27 19:16:19 +01:00 · 2007-04-27 19:16:19 +01:00 · d1da4e50e5
commit d1da4e50e5
parent 78ab67da10 a205752d1a
1432 changed files with 69191 additions and 64874 deletions
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/atalk.h
+++ b/include/linux/atalk.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/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/hdlc.h
+++ b/include/linux/hdlc.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_addr.h
+++ b/include/linux/if_addr.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/linux/if_bridge.h
+++ b/include/linux/if_bridge.h
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
--- a/include/linux/if_link.h
+++ b/include/linux/if_link.h
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
--- a/include/linux/if_tr.h
+++ b/include/linux/if_tr.h
--- a/include/linux/if_vlan.h
+++ b/include/linux/if_vlan.h
--- a/include/linux/if_wanpipe_common.h
+++ b/include/linux/if_wanpipe_common.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/ip.h
+++ b/include/linux/ip.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/jhash.h
+++ b/include/linux/jhash.h
--- a/include/linux/key.h
+++ b/include/linux/key.h
--- a/include/linux/ktime.h
+++ b/include/linux/ktime.h
--- a/include/linux/mtd/ubi.h
+++ b/include/linux/mtd/ubi.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_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_conntrack.h
+++ b/include/linux/netfilter/nfnetlink_conntrack.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_arp.h
+++ b/include/linux/netfilter_bridge/ebt_arp.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_amanda.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_amanda.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_core.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_core.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_helper.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_helper.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_icmp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_icmp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_irc.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_irc.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_conntrack_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_protocol.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_sctp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_sip.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_sip.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tcp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tftp.h
--- a/include/linux/netfilter_ipv4/ip_conntrack_tuple.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_tuple.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_helper.h
+++ b/include/linux/netfilter_ipv4/ip_nat_helper.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_nat_protocol.h
+++ b/include/linux/netfilter_ipv4/ip_nat_protocol.h
--- a/include/linux/netfilter_ipv4/ip_nat_rule.h
+++ b/include/linux/netfilter_ipv4/ip_nat_rule.h
--- a/include/linux/netfilter_ipv4/ipt_SAME.h
+++ b/include/linux/netfilter_ipv4/ipt_SAME.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
--- a/include/linux/page-flags.h
+++ b/include/linux/page-flags.h
--- a/include/linux/rtnetlink.h
+++ b/include/linux/rtnetlink.h
--- a/include/linux/rxrpc.h
+++ b/include/linux/rxrpc.h
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
--- a/include/linux/sctp.h
+++ b/include/linux/sctp.h
--- a/include/linux/sdla_fr.h
+++ b/include/linux/sdla_fr.h
--- a/include/linux/seqlock.h
+++ b/include/linux/seqlock.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
--- a/include/linux/string.h
+++ b/include/linux/string.h
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/udp.h
+++ b/include/linux/udp.h
--- a/include/linux/workqueue.h
+++ b/include/linux/workqueue.h
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h