linux

mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-01-16 01:54:00 +00:00

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

clock.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

clock.h

ARM: 6949/2: mach-u300: fix compilaton warning in IO accessors

2011-06-09 10:15:06 +01:00

core.c

Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc