Russell King 988addf82e Merge branch 'origin' into devel-stable ...

Conflicts:
	arch/arm/mach-mx2/devices.c
	arch/arm/mach-mx2/devices.h
	sound/soc/pxa/pxa-ssp.c

2010-03-08 20:21:04 +00:00

..

include/plat

ARM: 5908/1: nomadik: add platform specific i2c configuration

2010-02-04 18:04:50 +00:00

Kconfig

ARM: 5833/1: ARM nomadik: enable U8500 for common platform

2009-11-28 10:22:53 +00:00

Makefile

ARM: 5786/1: Introduce plat-nomadik, MTU code re-organization

2009-11-28 10:22:51 +00:00

timer.c

arm/{pxa,sa1100,nomadik}: Don't disable irqs in set_next_event and set_mode

2010-01-22 17:04:52 +01:00