Russell King 404a02cbd2 Merge branch 'devel-stable' into devel ... Conflicts: arch/arm/mach-pxa/clock.c arch/arm/mach-pxa/clock.h		2011-01-06 22:33:32 +00:00
..
clock.c	ARM: 6483/1: arm & sh: factorised duplicated clkdev.c	2010-11-26 10:51:04 +00:00
crm_regs.h	ARM: mxc91231: remove paragraphs with old address of the FSF	2010-06-30 09:00:27 +02:00
devices.c
devices.h
iomux.c
Kconfig
magx-zn5.c	arm: remove machine_desc.io_pg_offst and .phys_io	2010-10-20 00:27:46 -04:00
Makefile
Makefile.boot
mm.c	ARM: imx: use MXxy_IO_P2V macros to setup static mappings	2010-11-17 08:58:09 +01:00
system.c