Russell King 2e0e943436 Merge branch 'devel-stable' into for-linus ... Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c		2012-01-05 13:24:33 +00:00
..
include/plat	ARM: 7063/1: Orion: gpio: add missing include of linux/types.h	2011-08-24 08:29:20 +01:00
common.c	ARM: orion: Consolidate setup of the crypto engine.	2011-05-16 15:16:17 -04:00
gpio.c	ARM: plat-orion: make gpiochip label unique	2011-12-19 20:55:36 -08:00
irq.c	arm: orion: Use generic irq chip	2011-05-16 14:34:54 -04:00
Makefile	ARM: orion: Refactor the MPP code common in the orion platform	2011-05-16 15:25:54 -04:00
mpp.c	ARM: dove: Consolidate mpp code with platform mpp.	2011-05-16 15:49:31 -04:00
pcie.c	[ARM] Kirkwood: restrict the scope of the PCIe reset workaround	2010-10-21 15:52:03 -04:00
time.c	ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime	2011-12-18 23:00:26 +00:00