Merge branch 'master' into for-next

Fast-forwarded to current state of Linus' tree as there are patches to be applied for files that didn't exist on the old branch.
2026-10-16 22:39:48 +00:00 · 2011-04-26 10:22:15 +02:00 · 2011-04-26 10:22:15 +02:00 · 07f9479a40
commit 07f9479a40
parent 9d5e6bdb30 cd2e49e90f
6182 changed files with 216386 additions and 106780 deletions
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
--- a/include/acpi/acpi_bus.h
+++ b/include/acpi/acpi_bus.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actbl.h
+++ b/include/acpi/actbl.h
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
--- a/include/asm-generic/bitops.h
+++ b/include/asm-generic/bitops.h
--- a/include/asm-generic/bitops/ext2-atomic.h
+++ b/include/asm-generic/bitops/ext2-atomic.h
--- a/include/asm-generic/bitops/ext2-non-atomic.h
+++ b/include/asm-generic/bitops/ext2-non-atomic.h
--- a/include/asm-generic/bitops/le.h
+++ b/include/asm-generic/bitops/le.h
--- a/include/asm-generic/bitops/minix-le.h
+++ b/include/asm-generic/bitops/minix-le.h
--- a/include/asm-generic/bitops/minix.h
+++ b/include/asm-generic/bitops/minix.h
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
--- a/include/asm-generic/siginfo.h
+++ b/include/asm-generic/siginfo.h
--- a/include/asm-generic/types.h
+++ b/include/asm-generic/types.h
--- a/include/asm-generic/unistd.h
+++ b/include/asm-generic/unistd.h
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
--- a/include/drm/drm.h
+++ b/include/drm/drm.h
--- a/include/drm/drmP.h
+++ b/include/drm/drmP.h
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
--- a/include/drm/drm_mm.h
+++ b/include/drm/drm_mm.h
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/drm/mga_drm.h
+++ b/include/drm/mga_drm.h
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_drm.h
--- a/include/drm/savage_drm.h
+++ b/include/drm/savage_drm.h
--- a/include/drm/ttm/ttm_bo_api.h
+++ b/include/drm/ttm/ttm_bo_api.h
--- a/include/drm/ttm/ttm_bo_driver.h
+++ b/include/drm/ttm/ttm_bo_driver.h
--- a/include/drm/vmwgfx_drm.h
+++ b/include/drm/vmwgfx_drm.h
--- a/include/keys/ceph-type.h
+++ b/include/keys/ceph-type.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/acpi_io.h
+++ b/include/linux/acpi_io.h
--- a/include/linux/aer.h
+++ b/include/linux/aer.h
--- a/include/linux/amba/clcd.h
+++ b/include/linux/amba/clcd.h
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.h
--- a/include/linux/atmdev.h
+++ b/include/linux/atmdev.h
--- a/include/linux/backing-dev.h
+++ b/include/linux/backing-dev.h
--- a/include/linux/backlight.h
+++ b/include/linux/backlight.h
--- a/include/linux/bch.h
+++ b/include/linux/bch.h
--- a/include/linux/bio.h
+++ b/include/linux/bio.h
--- a/include/linux/bit_spinlock.h
+++ b/include/linux/bit_spinlock.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/bootmem.h
+++ b/include/linux/bootmem.h
--- a/include/linux/buffer_head.h
+++ b/include/linux/buffer_head.h
--- a/include/linux/can/core.h
+++ b/include/linux/can/core.h
--- a/include/linux/can/error.h
+++ b/include/linux/can/error.h
--- a/include/linux/can/netlink.h
+++ b/include/linux/can/netlink.h
--- a/include/linux/can/platform/mcp251x.h
+++ b/include/linux/can/platform/mcp251x.h
--- a/include/linux/capability.h
+++ b/include/linux/capability.h
--- a/include/linux/cdk.h
+++ b/include/linux/cdk.h
--- a/include/linux/ceph/auth.h
+++ b/include/linux/ceph/auth.h
--- a/include/linux/ceph/ceph_fs.h
+++ b/include/linux/ceph/ceph_fs.h
--- a/include/linux/ceph/libceph.h
+++ b/include/linux/ceph/libceph.h
--- a/include/linux/ceph/osd_client.h
+++ b/include/linux/ceph/osd_client.h
--- a/include/linux/ceph/rados.h
+++ b/include/linux/ceph/rados.h
--- a/include/linux/cfag12864b.h
+++ b/include/linux/cfag12864b.h
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
--- a/include/linux/cm4000_cs.h
+++ b/include/linux/cm4000_cs.h
--- a/include/linux/compaction.h
+++ b/include/linux/compaction.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler-gcc3.h
+++ b/include/linux/compiler-gcc3.h
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
--- a/include/linux/configfs.h
+++ b/include/linux/configfs.h
--- a/include/linux/connector.h
+++ b/include/linux/connector.h
--- a/include/linux/cper.h
+++ b/include/linux/cper.h
--- a/include/linux/crc32.h
+++ b/include/linux/crc32.h
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
--- a/include/linux/davinci_emac.h
+++ b/include/linux/davinci_emac.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/decompress/mm.h
+++ b/include/linux/decompress/mm.h
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dm-ioctl.h
+++ b/include/linux/dm-ioctl.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_limits.h
+++ b/include/linux/drbd_limits.h
--- a/include/linux/drbd_nl.h
+++ b/include/linux/drbd_nl.h
--- a/include/linux/drbd_tag_magic.h
+++ b/include/linux/drbd_tag_magic.h
--- a/include/linux/dw_dmac.h
+++ b/include/linux/dw_dmac.h
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
--- a/include/linux/err.h
+++ b/include/linux/err.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/eventpoll.h
+++ b/include/linux/eventpoll.h
--- a/include/linux/exportfs.h
+++ b/include/linux/exportfs.h
--- a/include/linux/ext3_fs.h
+++ b/include/linux/ext3_fs.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/firewire-cdev.h
+++ b/include/linux/firewire-cdev.h
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.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/fscache.h
+++ b/include/linux/fscache.h
--- a/include/linux/genhd.h
+++ b/include/linux/genhd.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
--- a/include/linux/hp_sdc.h
+++ b/include/linux/hp_sdc.h
--- a/include/linux/i2c-id.h
+++ b/include/linux/i2c-id.h
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/i2c/ads1015.h
+++ b/include/linux/i2c/ads1015.h
--- a/include/linux/i2c/atmel_mxt_ts.h
+++ b/include/linux/i2c/atmel_mxt_ts.h
--- a/Show more
+++ b/Show more