Merge branch 'gic-fasteoi' of git://linux-arm.org/linux-2.6-wd into devel-stable

2026-10-14 05:55:17 +00:00 · 2011-05-11 18:45:21 +01:00 · 2011-05-11 18:45:21 +01:00 · 254c44ea82
commit 254c44ea82
parent 7b76415375 6ac77e469e
142 changed files with 1952 additions and 1586 deletions
--- a/Documentation/flexible-arrays.txt
+++ b/Documentation/flexible-arrays.txt
--- a/2
+++ b/2
--- a/arch/arm/common/gic.c
+++ b/arch/arm/common/gic.c
--- a/arch/arm/configs/at91x40_defconfig
+++ b/arch/arm/configs/at91x40_defconfig
--- a/arch/arm/kernel/ptrace.c
+++ b/arch/arm/kernel/ptrace.c
--- a/arch/arm/mach-at91/Kconfig
+++ b/arch/arm/mach-at91/Kconfig
--- a/arch/arm/mach-at91/board-eb01.c
+++ b/arch/arm/mach-at91/board-eb01.c
--- a/arch/arm/mach-at91/include/mach/cpu.h
+++ b/arch/arm/mach-at91/include/mach/cpu.h
--- a/arch/arm/mach-exynos4/irq-combiner.c
+++ b/arch/arm/mach-exynos4/irq-combiner.c
--- a/arch/arm/mach-msm/gpio-v2.c
+++ b/arch/arm/mach-msm/gpio-v2.c
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
--- a/arch/arm/mach-tegra/gpio.c
+++ b/arch/arm/mach-tegra/gpio.c
--- a/arch/arm/mach-tegra/include/mach/legacy_irq.h
+++ b/arch/arm/mach-tegra/include/mach/legacy_irq.h
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
--- a/arch/arm/mach-tegra/legacy_irq.c
+++ b/arch/arm/mach-tegra/legacy_irq.c
--- a/arch/arm/plat-nomadik/gpio.c
+++ b/arch/arm/plat-nomadik/gpio.c
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
--- a/arch/sh/kernel/ptrace_32.c
+++ b/arch/sh/kernel/ptrace_32.c
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
--- a/arch/x86/kernel/reboot_32.S
+++ b/arch/x86/kernel/reboot_32.S
--- a/arch/x86/mm/numa_64.c
+++ b/arch/x86/mm/numa_64.c
--- a/arch/x86/xen/mmu.c
+++ b/arch/x86/xen/mmu.c
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
--- a/drivers/gpu/drm/drm_mm.c
+++ b/drivers/gpu/drm/drm_mm.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
--- a/drivers/gpu/drm/radeon/evergreend.h
+++ b/drivers/gpu/drm/radeon/evergreend.h
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
--- a/drivers/gpu/drm/radeon/radeon_atpx_handler.c
+++ b/drivers/gpu/drm/radeon/radeon_atpx_handler.c
--- a/drivers/gpu/drm/radeon/radeon_cursor.c
+++ b/drivers/gpu/drm/radeon/radeon_cursor.c
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
--- a/drivers/input/touchscreen/wm831x-ts.c
+++ b/drivers/input/touchscreen/wm831x-ts.c
--- a/drivers/media/dvb/dvb-usb/Kconfig
+++ b/drivers/media/dvb/dvb-usb/Kconfig
--- a/drivers/media/dvb/ngene/ngene-core.c
+++ b/drivers/media/dvb/ngene/ngene-core.c
--- a/drivers/media/radio/saa7706h.c
+++ b/drivers/media/radio/saa7706h.c
--- a/drivers/media/radio/tef6862.c
+++ b/drivers/media/radio/tef6862.c
--- a/drivers/media/rc/imon.c
+++ b/drivers/media/rc/imon.c
--- a/drivers/media/rc/ite-cir.c
+++ b/drivers/media/rc/ite-cir.c
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
--- a/drivers/media/rc/rc-main.c
+++ b/drivers/media/rc/rc-main.c
--- a/drivers/media/video/m52790.c
+++ b/drivers/media/video/m52790.c
--- a/drivers/media/video/tda9840.c
+++ b/drivers/media/video/tda9840.c
--- a/drivers/media/video/tea6415c.c
+++ b/drivers/media/video/tea6415c.c
--- a/drivers/media/video/tea6420.c
+++ b/drivers/media/video/tea6420.c
--- a/drivers/media/video/upd64031a.c
+++ b/drivers/media/video/upd64031a.c
--- a/drivers/media/video/upd64083.c
+++ b/drivers/media/video/upd64083.c
--- a/drivers/mfd/omap-usb-host.c
+++ b/drivers/mfd/omap-usb-host.c
--- a/drivers/mmc/core/bus.c
+++ b/drivers/mmc/core/bus.c
--- a/drivers/mmc/core/host.c
+++ b/drivers/mmc/core/host.c
--- a/drivers/mmc/host/omap.c
+++ b/drivers/mmc/host/omap.c
--- a/drivers/mmc/host/sdhci-pci.c
+++ b/drivers/mmc/host/sdhci-pci.c
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
--- a/drivers/platform/x86/eeepc-laptop.c
+++ b/drivers/platform/x86/eeepc-laptop.c
--- a/drivers/platform/x86/sony-laptop.c
+++ b/drivers/platform/x86/sony-laptop.c
--- a/drivers/platform/x86/thinkpad_acpi.c
+++ b/drivers/platform/x86/thinkpad_acpi.c
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_hw.c
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_proc.c
--- a/drivers/staging/gma500/Kconfig
+++ b/drivers/staging/gma500/Kconfig
--- a/drivers/staging/intel_sst/intelmid_v1_control.c
+++ b/drivers/staging/intel_sst/intelmid_v1_control.c
--- a/drivers/staging/intel_sst/intelmid_v2_control.c
+++ b/drivers/staging/intel_sst/intelmid_v2_control.c
--- a/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
+++ b/drivers/staging/olpc_dcon/olpc_dcon_xo_1.c
--- a/drivers/staging/rts_pstor/debug.h
+++ b/drivers/staging/rts_pstor/debug.h
--- a/drivers/staging/rts_pstor/ms.c
+++ b/drivers/staging/rts_pstor/ms.c
--- a/drivers/staging/rts_pstor/rtsx_chip.c
+++ b/drivers/staging/rts_pstor/rtsx_chip.c
--- a/drivers/staging/rts_pstor/rtsx_scsi.c
+++ b/drivers/staging/rts_pstor/rtsx_scsi.c
--- a/drivers/staging/rts_pstor/sd.c
+++ b/drivers/staging/rts_pstor/sd.c
--- a/drivers/staging/rts_pstor/trace.h
+++ b/drivers/staging/rts_pstor/trace.h
--- a/drivers/staging/rts_pstor/xd.c
+++ b/drivers/staging/rts_pstor/xd.c
--- a/drivers/staging/solo6x10/Kconfig
+++ b/drivers/staging/solo6x10/Kconfig
--- a/drivers/staging/usbip/vhci_hcd.c
+++ b/drivers/staging/usbip/vhci_hcd.c
--- a/drivers/staging/usbip/vhci_sysfs.c
+++ b/drivers/staging/usbip/vhci_sysfs.c
--- a/drivers/staging/wlan-ng/cfg80211.c
+++ b/drivers/staging/wlan-ng/cfg80211.c
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
--- a/drivers/usb/host/isp1760-hcd.c
+++ b/drivers/usb/host/isp1760-hcd.c
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
--- a/drivers/usb/musb/musb_gadget.c
+++ b/drivers/usb/musb/musb_gadget.c
--- a/drivers/usb/musb/omap2430.c
+++ b/drivers/usb/musb/omap2430.c
--- a/fs/ceph/addr.c
+++ b/fs/ceph/addr.c
--- a/fs/ceph/caps.c
+++ b/fs/ceph/caps.c
--- a/fs/ceph/file.c
+++ b/fs/ceph/file.c
--- a/fs/ceph/inode.c
+++ b/fs/ceph/inode.c
--- a/fs/ceph/super.h
+++ b/fs/ceph/super.h
--- a/fs/ceph/xattr.c
+++ b/fs/ceph/xattr.c
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
--- a/fs/cifs/sess.c
+++ b/fs/cifs/sess.c
--- a/fs/hpfs/Kconfig
+++ b/fs/hpfs/Kconfig
--- a/fs/hpfs/alloc.c
+++ b/fs/hpfs/alloc.c
--- a/fs/hpfs/anode.c
+++ b/fs/hpfs/anode.c
--- a/fs/hpfs/buffer.c
+++ b/fs/hpfs/buffer.c
--- a/Show more
+++ b/Show more