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	ARM: 6520/1: Kconfig: add new symbol MIGHT_HAVE_PCI	2010-12-05 08:39:30 +00:00
Makefile	ARM: cns3xxx: Add support for SDHCI controllers	2010-06-08 17:37:09 +04:00
Makefile.boot	ARM: cns3xxx: Add basic support for Cavium Networks CNS3xxx processors	2010-05-02 21:55:46 +04:00
cns3420vb.c	ARM: cns3xxx: Add architecture definition for EHCI/OHCI controller	2010-11-26 21:10:51 +03:00
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	ARM: cns3xxx: Add new and export the old power management functions	2010-11-26 21:10:50 +03:00
devices.h	ARM: cns3xxx: Add support for AHCI controllers	2010-06-08 17:37:09 +04:00
pcie.c	ARM: cns3xxx: Fix build with CONFIG_PCI=y	2010-11-29 19:19:15 +03:00
pm.c	ARM: cns3xxx: Add architecture definition for EHCI/OHCI controller	2010-11-26 21:10:51 +03:00