Merge branch 'ioat' into dmaengine

2026-10-16 22:39:48 +00:00 · 2010-05-17 16:30:58 -07:00 · 2010-05-17 16:30:58 -07:00 · 0b28330e39
commit 0b28330e39
parent 058276303d caa20d974c
4785 changed files with 31065 additions and 8710 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/pl061.h
+++ b/include/linux/amba/pl061.h
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.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/dmaengine.h
+++ b/include/linux/dmaengine.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/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/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/gameport.h
+++ b/include/linux/gameport.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/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/lcm.h
+++ b/include/linux/lcm.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.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/module.h
+++ b/include/linux/module.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/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/radix-tree.h
+++ b/include/linux/radix-tree.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/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/socket.h
+++ b/include/linux/socket.h
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.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/tracepoint.h
+++ b/include/linux/tracepoint.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/wimax/debug.h
+++ b/include/linux/wimax/debug.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/include/net/fib_rules.h
+++ b/include/net/fib_rules.h
--- a/include/net/ipx.h
+++ b/include/net/ipx.h
--- a/include/net/iucv/iucv.h
+++ b/include/net/iucv/iucv.h
--- a/include/net/netfilter/nf_conntrack_extend.h
+++ b/include/net/netfilter/nf_conntrack_extend.h
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
--- a/include/net/netlink.h
+++ b/include/net/netlink.h
--- a/include/net/netrom.h
+++ b/include/net/netrom.h
--- a/include/net/sock.h
+++ b/include/net/sock.h
--- a/include/net/x25.h
+++ b/include/net/x25.h
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
--- a/include/pcmcia/ss.h
+++ b/include/pcmcia/ss.h
--- a/include/scsi/libsas.h
+++ b/include/scsi/libsas.h
--- a/include/sound/ak4113.h
+++ b/include/sound/ak4113.h
--- a/include/sound/soc-dai.h
+++ b/include/sound/soc-dai.h
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
--- a/include/trace/events/block.h
+++ b/include/trace/events/block.h
--- a/include/xen/xenbus.h
+++ b/include/xen/xenbus.h