Merge remote branch 'origin' into secretlab/next-devicetree

Merging in current state of Linus' tree to deal with merge conflicts and build failures in vio.c after merge. Conflicts: drivers/i2c/busses/i2c-cpm.c drivers/i2c/busses/i2c-mpc.c drivers/net/gianfar.c Also fixed up one line in arch/powerpc/kernel/vio.c to use the correct node pointer. Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
2026-10-14 05:55:17 +00:00 · 2010-05-22 00:36:56 -06:00 · 2010-05-22 00:36:56 -06:00 · cf9b59e9d3
commit cf9b59e9d3
parent 44504b2beb f4b87dee92
7045 changed files with 499567 additions and 239679 deletions
--- a/include/acpi/acexcep.h
+++ b/include/acpi/acexcep.h
--- a/include/acpi/acoutput.h
+++ b/include/acpi/acoutput.h
--- a/include/acpi/acpiosxf.h
+++ b/include/acpi/acpiosxf.h
--- a/include/acpi/acpixf.h
+++ b/include/acpi/acpixf.h
--- a/include/acpi/actbl2.h
+++ b/include/acpi/actbl2.h
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
--- a/include/asm-generic/atomic.h
+++ b/include/asm-generic/atomic.h
--- a/include/asm-generic/bitops/arch_hweight.h
+++ b/include/asm-generic/bitops/arch_hweight.h
--- a/include/asm-generic/bitops/const_hweight.h
+++ b/include/asm-generic/bitops/const_hweight.h
--- a/include/asm-generic/bitops/hweight.h
+++ b/include/asm-generic/bitops/hweight.h
--- a/include/asm-generic/bug.h
+++ b/include/asm-generic/bug.h
--- a/include/asm-generic/dma-mapping-common.h
+++ b/include/asm-generic/dma-mapping-common.h
--- a/include/asm-generic/kmap_types.h
+++ b/include/asm-generic/kmap_types.h
--- a/include/crypto/algapi.h
+++ b/include/crypto/algapi.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_crtc_helper.h
+++ b/include/drm/drm_crtc_helper.h
--- a/include/drm/drm_edid.h
+++ b/include/drm/drm_edid.h
--- a/include/drm/drm_fb_helper.h
+++ b/include/drm/drm_fb_helper.h
--- a/include/drm/drm_fixed.h
+++ b/include/drm/drm_fixed.h
--- a/include/drm/radeon_drm.h
+++ b/include/drm/radeon_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/ttm/ttm_page_alloc.h
+++ b/include/drm/ttm/ttm_page_alloc.h
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
--- a/include/linux/ahci_platform.h
+++ b/include/linux/ahci_platform.h
--- a/include/linux/altera_jtaguart.h
+++ b/include/linux/altera_jtaguart.h
--- a/include/linux/altera_uart.h
+++ b/include/linux/altera_uart.h
--- a/include/linux/amba/mmci.h
+++ b/include/linux/amba/mmci.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/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/can/platform/sja1000.h
+++ b/include/linux/can/platform/sja1000.h
--- a/include/linux/cgroup.h
+++ b/include/linux/cgroup.h
--- a/include/linux/clocksource.h
+++ b/include/linux/clocksource.h
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
--- a/include/linux/cpufreq.h
+++ b/include/linux/cpufreq.h
--- a/include/linux/cpuset.h
+++ b/include/linux/cpuset.h
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
--- a/include/linux/dcbnl.h
+++ b/include/linux/dcbnl.h
--- a/include/linux/debugobjects.h
+++ b/include/linux/debugobjects.h
--- a/include/linux/device.h
+++ b/include/linux/device.h
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
--- a/include/linux/dqblk_xfs.h
+++ b/include/linux/dqblk_xfs.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/elevator.h
+++ b/include/linux/elevator.h
--- a/include/linux/elf.h
+++ b/include/linux/elf.h
--- a/include/linux/elfcore.h
+++ b/include/linux/elfcore.h
--- a/include/linux/ethtool.h
+++ b/include/linux/ethtool.h
--- a/include/linux/ext2_fs_sb.h
+++ b/include/linux/ext2_fs_sb.h
--- a/include/linux/fb.h
+++ b/include/linux/fb.h
--- a/include/linux/fcntl.h
+++ b/include/linux/fcntl.h
--- a/include/linux/filter.h
+++ b/include/linux/filter.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/firmware.h
+++ b/include/linux/firmware.h
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
--- a/include/linux/ftrace.h
+++ b/include/linux/ftrace.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/generic_acl.h
+++ b/include/linux/generic_acl.h
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
--- a/include/linux/gsmmux.h
+++ b/include/linux/gsmmux.h
--- a/include/linux/hdpu_features.h
+++ b/include/linux/hdpu_features.h
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
--- a/include/linux/hrtimer.h
+++ b/include/linux/hrtimer.h
--- a/include/linux/hw_breakpoint.h
+++ b/include/linux/hw_breakpoint.h
--- a/include/linux/i2c-omap.h
+++ b/include/linux/i2c-omap.h
--- a/include/linux/i2c.h
+++ b/include/linux/i2c.h
--- a/include/linux/i2c/twl.h
+++ b/include/linux/i2c/twl.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.h
+++ b/include/linux/if.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_link.h
+++ b/include/linux/if_link.h
--- a/include/linux/if_macvlan.h
+++ b/include/linux/if_macvlan.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_tun.h
+++ b/include/linux/if_tun.h
--- a/include/linux/if_x25.h
+++ b/include/linux/if_x25.h
--- a/include/linux/in6.h
+++ b/include/linux/in6.h
--- a/include/linux/init_task.h
+++ b/include/linux/init_task.h
--- a/include/linux/input.h
+++ b/include/linux/input.h
--- a/include/linux/input/ad714x.h
+++ b/include/linux/input/ad714x.h
--- a/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
--- a/include/linux/ioport.h
+++ b/include/linux/ioport.h
--- a/include/linux/ipv6.h
+++ b/include/linux/ipv6.h
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
--- a/include/linux/isapnp.h
+++ b/include/linux/isapnp.h
--- a/include/linux/jbd.h
+++ b/include/linux/jbd.h
--- a/Show more
+++ b/Show more