linux/arch/arm/plat-nomadik
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
Makefile
timer.c