Arnd Bergmann d2819f80d4 Merge branch 'spear/pinctrl' into spear/clock ... Conflicts: arch/arm/mach-spear3xx/Makefile arch/arm/mach-spear3xx/clock.c arch/arm/mach-spear3xx/include/mach/generic.h arch/arm/mach-spear6xx/clock.c arch/arm/plat-spear/Makefile drivers/pinctrl/core.c This resolves some annoying merge conflicts. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-05-14 15:33:42 +02:00
..
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h	ARM: create a common IOMEM definition	2012-03-13 21:22:09 -05:00
keyboard.h	Input: spear-keyboard - remove kbd_set_plat_data()	2012-03-19 17:55:39 -07:00
pl080.h	SPEAr: Add PL080 DMA support for 3xx and 6xx	2012-04-22 22:41:35 +02:00
shirq.h	ARM: 6091/1: ST SPEAr: Adding support for shared irq layer	2010-05-04 16:54:54 +01:00
timex.h	ARM: 6012/1: ST SPEAr: Added basic header files for SPEAr platform	2010-04-14 11:31:58 +01:00
uncompress.h	ARM: 6788/1: SPEAr: Include mach/hardware.h instead of mach/spear.h	2011-03-09 09:49:45 +00:00