Arnd Bergmann 09fa31a322 Merge branch 'dt/gic' into highbank/soc ...

Conflicts:
	arch/arm/Kconfig

2011-10-31 14:11:34 +01:00

..

include/mach

Merge branch 'dt/gic' into highbank/soc

2011-10-31 14:11:34 +01:00

common.h

…

core.c

…

cpu.c

…

impd1.c

…

integrator_ap.c

Merge remote-tracking branch 'rmk/devel-stable' into HEAD

2011-10-24 14:02:37 -05:00

integrator_cp.c

ARM: mach-integrator: convert boot_params to atag_offset

2011-08-21 17:14:51 -04:00

Kconfig

…

leds.c

…

lm.c

…

Makefile

…

Makefile.boot

…

pci_v3.c

mach-integrator: fix VGA base regression

2011-09-20 22:58:41 +02:00

pci.c

…