You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 6aba74f279 Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip ... * 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: avr32: Fix missing irq namespace conversion powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip genirq: Remove the now obsolete config options and select statements arm: versatile : Fix typo introduced in irq namespace cleanup sound: Fixup the last user of the old irq functions genirq: Remove obsolete comment genirq: Remove now obsolete set_irq_wake() sh: Fix irq cleanup fallout x86: apb_timer: Fixup genirq fallout genirq: Fix misnamed label in handle_edge_eoi_irq Fix up crazy conflict in arch/powerpc/include/asm/qe_ic.h: - commit eead4d5c63 ("powerpc: qe_ic: Rename get_irq_desc_data and get_irq_desc_chip") made the helper functions use irq_desc_get_handler_data() instead of the legacy (and no longer existing) get_irq_desc_data. - commit d4db35e8dc ("powerpc/qe_ic: Fix another breakage from the irq_data conversion") used irq_desc_get_chip_data() instead. According to Thomas, the former is the correct direct conversion, but it does look like both should work (arch/powerpc/sysdev/qe_lib/qe_ic.c seems to initialize both to the same thing), and the chip data in some ways is the more logical. Somebody should really decide on one of the other. This merge picks irq_desc_get_handler_data() as the straightforward pure conversion to new names, as per Thomas.		14 years ago
..
boot	ARM: 6826/1: Merge v6 and v7 DEBUG_LL DCC support	14 years ago
common	arm: Fold irq_set_chip/irq_set_handler	14 years ago
configs	Merge branch 'for-linus' of git://android.git.kernel.org/kernel/tegra	14 years ago
include/asm	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
kernel	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
lib	Merge branches 'fixes', 'pgt-next' and 'versatile' into devel	14 years ago
mach-at91	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-bcmring	arm: Cleanup the irq namespace	14 years ago
mach-clps711x	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-cns3xxx	…
mach-davinci	arm: Cleanup the irq namespace	14 years ago
mach-dove	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-ebsa110	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-ep93xx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-exynos4	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-footbridge	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-gemini	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-h720x	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-imx	Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable	14 years ago
mach-integrator	Merge branches 'fixes', 'pgt-next' and 'versatile' into devel	14 years ago
mach-iop13xx	arm: Cleanup the irq namespace	14 years ago
mach-iop32x	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-iop33x	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-ixp4xx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-ixp23xx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-ixp2000	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-kirkwood	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-ks8695	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-l7200/include/mach	…
mach-loki	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-lpc32xx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-mmp	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-msm	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-mv78xx0	arm: Cleanup the irq namespace	14 years ago
mach-mx3	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-mx5	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-mxc91231	…
mach-mxs	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-netx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-nomadik	…
mach-ns9xxx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-nuc93x	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-omap1	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-omap2	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-orion5x	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-pnx4008	arm: Cleanup the irq namespace	14 years ago
mach-pxa	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-realview	ARM: 6807/1: realview: Fix secondary GIC initialisation for EB with MPCore tile	14 years ago
mach-rpc	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s3c24a0/include/mach	…
mach-s3c64xx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s3c2400	…
mach-s3c2410	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s3c2412	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s3c2416	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s3c2440	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s3c2443	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-s5p64x0	ARM: S5P64X0: Fix iodesc array size for S5P6450	14 years ago
mach-s5p6442	Merge branch 'p2v' into devel	14 years ago
mach-s5pc100	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-s5pv210	ARM: S5PV210: Remove duplicated inclusion	14 years ago
mach-sa1100	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-shark	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-shmobile	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc	14 years ago
mach-spear3xx	ARM: 6794/1: SPEAr: Append UL to device address macros.	14 years ago
mach-spear6xx	ARM: 6794/1: SPEAr: Append UL to device address macros.	14 years ago
mach-stmp37xx	…
mach-stmp378x	…
mach-tcc8k	arm: Cleanup the irq namespace	14 years ago
mach-tegra	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-u300	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
mach-ux500	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-versatile	arm: versatile : Fix typo introduced in irq namespace cleanup	14 years ago
mach-vexpress	ARM: 6771/1: vexpress: add support for multiple core tiles	14 years ago
mach-vt8500	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mach-w90x900	arm: Fold irq_set_chip/irq_set_handler	14 years ago
mm	lib, arch: add filter argument to show_mem and fix private implementations	14 years ago
nwfpe	…
oprofile	…
plat-iop	…
plat-mxc	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
plat-nomadik	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-omap	arm: Cleanup the irq namespace	14 years ago
plat-orion	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-pxa	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-s3c24xx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-s5p	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-samsung	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-spear	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-stmp3xxx	arm: Fold irq_set_chip/irq_set_handler	14 years ago
plat-tcc	…
plat-versatile	arm: Fold irq_set_chip/irq_set_handler	14 years ago
tools	ARM: Update (and cut down) mach-types	14 years ago
vfp	Merge branch 'trivial' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6	14 years ago
Kconfig	Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago
Kconfig-nommu	…
Kconfig.debug	…
Makefile	Merge branch 'devel-stable' of master.kernel.org:/home/rmk/linux-2.6-arm	14 years ago