tmp_suning_uos_patched/arch/arm/mach-dove
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/mach Merge branch 'misc2' into devel 2010-02-25 22:09:41 +00:00
addr-map.c
common.c mach-dove/common.c: remove unnecessary (void *) casts 2010-02-05 00:27:03 -05:00
common.h
dove-db-setup.c
irq.c
Kconfig
Makefile
Makefile.boot
pcie.c