Merge branch 'master' into next

2026-10-16 22:39:48 +00:00 · 2010-05-06 10:56:07 +10:00 · 2010-05-06 10:56:07 +10:00 · 0ffbe2699c
commit 0ffbe2699c
parent 4e5d6f7ec3 7ebd467551
5016 changed files with 37854 additions and 10466 deletions
--- 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/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/bitops.h
+++ b/include/linux/bitops.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.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/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
--- a/include/linux/firewire-constants.h
+++ b/include/linux/firewire-constants.h
--- a/include/linux/freezer.h
+++ b/include/linux/freezer.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.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/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/i2o.h
+++ b/include/linux/i2o.h
--- a/include/linux/ide.h
+++ b/include/linux/ide.h
--- a/include/linux/input/matrix_keypad.h
+++ b/include/linux/input/matrix_keypad.h
--- a/include/linux/io-mapping.h
+++ b/include/linux/io-mapping.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/kvm_host.h
+++ b/include/linux/kvm_host.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/module.h
+++ b/include/linux/module.h
--- a/include/linux/ncp_fs_sb.h
+++ b/include/linux/ncp_fs_sb.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/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/poison.h
+++ b/include/linux/poison.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/regulator/consumer.h
+++ b/include/linux/regulator/consumer.h
--- a/include/linux/security.h
+++ b/include/linux/security.h
--- a/include/linux/slab.h
+++ b/include/linux/slab.h
--- a/include/linux/smb_fs_sb.h
+++ b/include/linux/smb_fs_sb.h
--- a/include/linux/spi/spi.h
+++ b/include/linux/spi/spi.h
--- a/include/linux/taskstats_kern.h
+++ b/include/linux/taskstats_kern.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/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/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/netrom.h
+++ b/include/net/netrom.h
--- a/include/net/sctp/command.h
+++ b/include/net/sctp/command.h
--- a/include/net/sctp/sctp.h
+++ b/include/net/sctp/sctp.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/ds.h
+++ b/include/pcmcia/ds.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