Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel - linux-dev - Linux kernel development work

diff options

author	Russell King <rmk+kernel@arm.linux.org.uk>	2010-05-17 11:52:31 +0100
committer	Russell King <rmk+kernel@arm.linux.org.uk>	2010-05-17 11:53:39 +0100
commit	c39e52a793f5599582dbacf4d8f62634a492f79e (patch)
tree	7379649b5a722ceb45cc66f049a7571c66054dcd /arch/arm/Makefile
parent	ARM: 5966/1: at91_udc HW glitch (diff)
parent	ARM: 6047/1: ARM: BCMRING: register PMU IRQ during board initialisation (diff)
parent	ARM: 6124/1: ep93xx: SPI driver platform support code (diff)
parent	ARM: 6048/1: ARM: iop3xx: register PMU IRQs during board initialisation (diff)
parent	ARM: Optionally allow ARMv6 to use 'normal, bufferable' memory for DMA (diff)
parent	ARM: 6107/1: plat-nomadik: use the MTU clocksrc for sched_clock (diff)
parent	ARM: 6046/1: ARM: OMAP: register PMU IRQs during board initialisation (diff)
parent	ARM: 6049/1: ARM: pxa: register PMU IRQs during board initialisation (diff)
parent	ARM: 6091/1: ST SPEAr: Adding support for shared irq layer (diff)
parent	ARM: 6057/1: Realview: register PMU IRQs during board initialisation (diff)
download	linux-dev-c39e52a793f5599582dbacf4d8f62634a492f79e.tar.xz linux-dev-c39e52a793f5599582dbacf4d8f62634a492f79e.zip

Merge branches 'at91', 'bcmring', 'ep93xx', 'iop', 'misc', 'nomadik', 'omap', 'pxa', 'spear' and 'versatile' into devel

Conflicts: arch/arm/Makefile arch/arm/common/Makefile arch/arm/mm/Kconfig