Russell King ddd559b13f Merge branch 'devel-stable' into devel ...

Conflicts:
	MAINTAINERS
	arch/arm/mm/fault.c

2009-09-12 12:02:26 +01:00

..

include/mach

…

clock.c

…

clock.h

…

core.c

[ARM] 5594/1: Correct U300 VIC init PM setting

2009-07-09 16:15:46 +01:00

gpio.c

…

Kconfig

…

Makefile

…

Makefile.boot

…

mmc.c

MMC: MMCI: allow GPIOs to be passed

2009-07-09 15:15:12 +01:00

mmc.h

…

padmux.c

…

padmux.h

…

timer.c

…

u300.c

…