kernel-fxtec-pro1x/arch/arm/mach-mx1
Russell King 7d83f8fca5 Merge branch 'master' of git://git.marvell.com/orion into devel
Conflicts:

	arch/arm/mach-mx1/devices.c
2009-03-19 23:10:40 +00:00
..
clock.c
crm_regs.h
devices.c
devices.h
generic.c
Kconfig arm/imx: Kconfig beautification 2009-03-13 10:34:18 +01:00
Makefile
Makefile.boot
mx1ads.c Merge branch 'master' of git://git.marvell.com/orion into devel 2009-03-19 23:10:40 +00:00
scb9328.c