Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-24 06:01:01 +00:00
Code Issues Packages Projects Releases Wiki Activity
136848d4ca
linux/arch/arm/mach-ep93xx
History
Russell King 2d13ccaa87 Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 
Conflicts:
	arch/arm/mach-omap2/board-4430sdp.c
	arch/arm/mach-omap2/board-omap4panda.c
	arch/arm/mach-omap2/include/mach/omap4-common.h
	arch/arm/plat-omap/include/plat/irqs.h

The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved.  The now empty ifdef in irqs.h
was also eliminated.
2011-11-21 21:56:56 +00:00
..
include/mach Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 2011-11-21 21:56:56 +00:00
adssphere.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
clock.c ARM: 6483/1: arm & sh: factorised duplicated clkdev.c 2010-11-26 10:51:04 +00:00
core.c arm: Add export.h to ARM specific files as required. 2011-10-31 19:30:50 -04:00
dma.c ep93xx: add dmaengine platform code 2011-06-08 15:45:52 -06:00
edb93xx.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
gesbc9312.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
Kconfig ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile ep93xx: add support Vision EP9307 SoM 2011-10-17 11:22:11 +00:00
Makefile.boot ARM: 7022/1: allow to detect conflicting zreladdrs 2011-10-17 09:12:40 +01:00
micro9.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
simone.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
snappercl15.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
ts72xx.c ARM: ep93xx: convert to MULTI_IRQ_HANDLER 2011-11-15 18:14:03 +00:00
vision_ep9307.c Merge branch 'depends/rmk/devel-stable' into next/board 2011-11-01 00:11:41 +01:00