Arnd Bergmann 43872fa788 Merge branch 'depends/rmk/gpio' into next/fixes ...

This sorts out merge conflicts with the arm/gpio branch that
already got merged into mainline Linux.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2011-10-31 22:44:18 +01:00

..

clkdev.h

ARM: mach-shmobile: SH-Mobile G3 support.

2010-02-08 12:44:11 +09:00

common.h

ARM / shmobile: Use pm_genpd_poweroff_unused()

2011-07-13 12:32:07 +02:00

dma.h

ARM: mach-shmobile: SH-Mobile G3 support.

2010-02-08 12:44:11 +09:00

entry-macro.S

ARM: mach-shmobile: Rely on run-time IRQ handlers

2011-01-07 10:43:02 +09:00

gpio.h

ARM: gpio: make trivial GPIOLIB implementation the default

2011-08-12 08:54:19 +01:00

hardware.h

ARM: mach-shmobile: Rely on run-time IRQ handlers

2011-01-07 10:43:02 +09:00

head-ap4evb.txt

ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot

2011-05-24 12:15:20 +09:00

head-mackerel.txt

ARM: mach-shmobile: ap4evb, mackerel: fixup scif initialisation for zboot

2011-05-24 12:15:20 +09:00

io.h

ARM: mach-shmobile: SH-Mobile G3 support.

2010-02-08 12:44:11 +09:00

irqs.h

ARM: mach-shmobile: Bump up NR_IRQS to 1024

2010-12-21 00:27:55 +09:00

memory.h

ARM: P2V: separate PHYS_OFFSET from platform definitions

2011-02-17 23:26:55 +00:00

mmc-ap4eb.h

mmc, ARM: Rename SuperH Mobile ARM zboot helpers

2011-03-25 01:24:57 +09:00

mmc-mackerel.h

mmc, ARM: Rename SuperH Mobile ARM zboot helpers

2011-03-25 01:24:57 +09:00

mmc.h

ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL

2011-04-06 11:08:20 -07:00

sdhi-sh7372.h

ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM

2011-06-29 10:00:52 +01:00

sdhi.h

ARM: 6886/1: mmc, Add zboot from eSD support for SuperH Mobile ARM

2011-06-29 10:00:52 +01:00

sh73a0.h

ARM: mach-shmobile: sh73a0: mark DMA slave ID 0 as invalid

2011-05-25 11:37:24 +09:00

sh7367.h

ARM: mach-shmobile: sh7367 and G3EVM pinmux support

2010-02-12 14:10:47 +09:00

sh7372.h

Merge branch 'rmobile/dma' into rmobile-fixes-for-linus

2011-08-29 16:10:24 +09:00

sh7377.h

ARM: mach-shmobile: sh7377 and G4EVM pinmux support

2010-02-15 13:43:37 +09:00

system.h

ARM: mach-shmobile: SH-Mobile G3 support.

2010-02-08 12:44:11 +09:00

timex.h

ARM: mach-shmobile: SH-Mobile G3 support.

2010-02-08 12:44:11 +09:00

uncompress.h

ARM: mach-shmobile: SH-Mobile G3 support.

2010-02-08 12:44:11 +09:00

vmalloc.h

ARM: mach-shmobile: fix compile warning in mm/init.c

2010-12-17 19:41:13 +09:00

zboot_macros.h

ARM: 6514/1: mach-shmobile: Add zboot support for SuperH Mobile ARM

2010-12-05 08:40:21 +00:00

zboot.h

ARM: mach-shmobile: Correctly check for CONFIG_MACH_MACKEREL

2011-04-06 11:08:20 -07:00