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
crm_regs.h
devices.c
devices.h
iomux.c
Kconfig
magx-zn5.c
Makefile
Makefile.boot
mm.c
system.c