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
..
include/mach	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
Kconfig	…
Makefile	…
Makefile.boot	…
cns3420vb.c	…
core.c	ARM: GIC: consolidate gic_cpu_base_addr to common GIC code	2010-12-14 19:21:42 +00:00
core.h	Merge branch 'devel-stable' into devel	2011-01-06 22:33:32 +00:00
devices.c	…
devices.h	…
pcie.c	…
pm.c	…