Merge branch 'master' of /repos/git/net-next-2.6

Conflicts: Documentation/feature-removal-schedule.txt net/ipv6/netfilter/ip6t_REJECT.c net/netfilter/xt_limit.c Signed-off-by: Patrick McHardy <kaber@trash.net>
2026-10-16 22:39:48 +00:00 · 2010-04-20 16:02:01 +02:00 · 2010-04-20 16:02:01 +02:00 · 6291055465
commit 6291055465
parent 22265a5c3c ab9304717f
5621 changed files with 135501 additions and 37924 deletions
--- a/include/acpi/acpi_drivers.h
+++ b/include/acpi/acpi_drivers.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_mem_util.h
+++ b/include/drm/drm_mem_util.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/linux/amba/bus.h
+++ b/include/linux/amba/bus.h
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
--- a/include/linux/amba/pl061.h
+++ b/include/linux/amba/pl061.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/caif/caif_socket.h
+++ b/include/linux/caif/caif_socket.h
--- a/include/linux/caif/if_caif.h
+++ b/include/linux/caif/if_caif.h
--- a/include/linux/can/dev.h
+++ b/include/linux/can/dev.h
--- a/include/linux/can/platform/mcp251x.h
+++ b/include/linux/can/platform/mcp251x.h
--- a/include/linux/circ_buf.h
+++ b/include/linux/circ_buf.h
--- a/include/linux/clockchips.h
+++ b/include/linux/clockchips.h
--- a/include/linux/delayacct.h
+++ b/include/linux/delayacct.h
--- a/include/linux/drbd.h
+++ b/include/linux/drbd.h
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
--- a/include/linux/ext3_fs_i.h
+++ b/include/linux/ext3_fs_i.h
--- a/include/linux/fib_rules.h
+++ b/include/linux/fib_rules.h
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/fscache-cache.h
+++ b/include/linux/fscache-cache.h
--- a/include/linux/fsnotify.h
+++ b/include/linux/fsnotify.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/gameport.h
+++ b/include/linux/gameport.h
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/ieee80211.h
+++ b/include/linux/ieee80211.h
--- a/include/linux/if_arp.h
+++ b/include/linux/if_arp.h
--- a/include/linux/if_ether.h
+++ b/include/linux/if_ether.h
--- a/include/linux/if_packet.h
+++ b/include/linux/if_packet.h
--- a/include/linux/if_pppol2tp.h
+++ b/include/linux/if_pppol2tp.h
--- a/include/linux/if_pppox.h
+++ b/include/linux/if_pppox.h
--- a/include/linux/if_tunnel.h
+++ b/include/linux/if_tunnel.h
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.h
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
--- a/include/linux/iscsi_ibft.h
+++ b/include/linux/iscsi_ibft.h
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
--- a/include/linux/jbd2.h
+++ b/include/linux/jbd2.h
--- a/include/linux/kernel.h
+++ b/include/linux/kernel.h
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
--- a/include/linux/l2tp.h
+++ b/include/linux/l2tp.h
--- a/include/linux/lcm.h
+++ b/include/linux/lcm.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/memory.h
+++ b/include/linux/memory.h
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
--- a/include/linux/mmc/sdio.h
+++ b/include/linux/mmc/sdio.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/mroute.h
+++ b/include/linux/mroute.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/netfilter/nfnetlink.h
+++ b/include/linux/netfilter/nfnetlink.h
--- a/include/linux/netfilter_ipv6.h
+++ b/include/linux/netfilter_ipv6.h
--- a/include/linux/netlink.h
+++ b/include/linux/netlink.h
--- a/include/linux/nl80211.h
+++ b/include/linux/nl80211.h
--- a/include/linux/notifier.h
+++ b/include/linux/notifier.h
--- a/include/linux/of.h
+++ b/include/linux/of.h
--- a/include/linux/page_cgroup.h
+++ b/include/linux/page_cgroup.h
--- a/include/linux/percpu.h
+++ b/include/linux/percpu.h
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
--- a/include/linux/ppp_channel.h
+++ b/include/linux/ppp_channel.h
--- a/include/linux/radix-tree.h
+++ b/include/linux/radix-tree.h
--- a/include/linux/rculist.h
+++ b/include/linux/rculist.h
--- a/include/linux/rcupdate.h
+++ b/include/linux/rcupdate.h
--- a/include/linux/reiserfs_xattr.h
+++ b/include/linux/reiserfs_xattr.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/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/snmp.h
+++ b/include/linux/snmp.h
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
--- a/include/linux/spi/l4f00242t03.h
+++ b/include/linux/spi/l4f00242t03.h
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
--- a/include/linux/sunrpc/bc_xprt.h
+++ b/include/linux/sunrpc/bc_xprt.h
--- a/include/linux/syscalls.h
+++ b/include/linux/syscalls.h
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.h
--- a/include/linux/tipc.h
+++ b/include/linux/tipc.h
--- a/include/linux/tracepoint.h
+++ b/include/linux/tracepoint.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/usb.h
+++ b/include/linux/usb.h
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
--- a/include/linux/virtio_console.h
+++ b/include/linux/virtio_console.h
--- a/include/linux/vt.h
+++ b/include/linux/vt.h
--- a/include/linux/wimax/debug.h
+++ b/include/linux/wimax/debug.h
--- a/include/linux/wireless.h
+++ b/include/linux/wireless.h
--- a/include/linux/writeback.h
+++ b/include/linux/writeback.h
--- a/include/net/9p/client.h
+++ b/include/net/9p/client.h
--- a/include/net/ax25.h
+++ b/include/net/ax25.h
--- a/include/net/bluetooth/bluetooth.h
+++ b/include/net/bluetooth/bluetooth.h
--- a/Show more
+++ b/Show more