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.		2011-03-30 09:35:52 -07:00
..
boot	Blackfin: encode cpu-rev into uImage name	2011-01-10 07:18:27 -05:00
configs	Blackfin: defconfigs: update after misc devices defaulted to N	2011-03-25 16:54:12 -04:00
include	Blackfin: bitops: fix include order after little endian inclusion	2011-03-25 16:54:13 -04:00
kernel	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin	2011-03-30 07:51:29 -07:00
lib	Blackfin: outs[lwb]: make sure count is greater than 0	2011-03-04 01:26:55 -05:00
mach-bf518	Blackfin: punt unused HDMA masks	2011-03-18 04:29:17 -04:00
mach-bf527	Blackfin: punt unused HDMA masks	2011-03-18 04:29:17 -04:00
mach-bf533	Blackfin: ip0x: fix unused variable warning	2011-03-18 05:17:02 -04:00
mach-bf537	Blackfin: punt unused HDMA masks	2011-03-18 04:29:17 -04:00
mach-bf538	Blackfin: boards: add missing "static" to peripheral lists	2011-01-10 07:18:25 -05:00
mach-bf548	Blackfin: bf54x: re-enable anomaly 05000353 for all revs	2011-03-22 21:06:16 -04:00
mach-bf561	bfin: Final irq cleanup	2011-03-29 14:47:59 +02:00
mach-common	bfin: Convert irq namespace	2011-03-29 14:47:59 +02:00
mm	Blackfin: sram_free_with_lsl: do not ignore return value of sram_free	2011-01-10 07:18:26 -05:00
oprofile	Blackfin arch: remove hardware PM code, oprofile not use it	2009-01-07 23:14:39 +08:00
ADI_BSD.txt	Blackfin: mass clean up of copyright/licensing info	2009-10-07 04:36:26 -04:00
Kconfig	genirq: Remove the now obsolete config options and select statements	2011-03-30 14:13:23 +02:00
Kconfig.debug	Blackfin: drop unused irq_panic()/DEBUG_ICACHE_CHECK	2010-10-25 17:24:00 -04:00
Makefile	Blackfin: encode cpu-rev into uImage name	2011-01-10 07:18:27 -05:00