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

..

include/mach

Merge branch 'depends/rmk/gpio' into next/fixes

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

board-ag5evm.c

ARM: mach-shmobile: ag5evm: SDHI requires waiting for idle

2011-07-25 17:14:30 +09:00

board-ap4evb.c

ARM: mach-shmobile: sh7372 LCDC1 suspend fix V2 (incremental)

2011-08-27 14:21:00 +02:00

board-g3evm.c

ARM: mach-shmobile: remove sh7367 on-chip set_irq_type()

2011-01-18 13:51:57 +09:00

board-g4evm.c

ARM: mach-shmobile: Correct the G4EVM SDHI0 I/O range.

2011-05-25 14:54:30 +09:00

board-mackerel.c

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

2011-08-29 13:37:17 -07:00

clock-sh73a0.c

ARM: mach-shmobile: clock-sh73a0: tidyup CKSCR main clock selecter

2011-08-29 16:22:39 +09:00

clock-sh7367.c

sh: move CLKDEV_xxx_ID macro to sh_clk.h

2011-07-11 15:07:25 +09:00

clock-sh7372.c

Merge branch 'rmobile-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-3.x

2011-08-29 13:37:17 -07:00

clock-sh7377.c

sh: move CLKDEV_xxx_ID macro to sh_clk.h

2011-07-11 15:07:25 +09:00

clock.c

…

console.c

…

cpuidle.c

ARM: mach-shmobile: CPUIdle support

2011-05-25 11:19:23 +09:00

entry-gic.S

ARM: mach-shmobile: update for GIC changes.

2011-01-07 12:02:11 +09:00

entry-intc.S

ARM: mach-shmobile: Run-time IRQ handler for INTCA

2011-01-07 10:42:50 +09:00

headsmp.S

ARM: mach-shmobile: headsmp.S build fix

2011-05-24 12:29:14 +09:00

hotplug.c

ARM: mach-shmobile: SMP base support

2010-12-14 18:15:44 +09:00

intc-sh73a0.c

ARM: mach-shmobile: sh73a0 gic_arch_extn.irq_set_wake() fix

2011-06-14 15:12:05 +09:00

intc-sh7367.c

arm: Cleanup the irq namespace

2011-03-29 14:47:57 +02:00

intc-sh7372.c

ARM: mach-shmobile: Remove 3DG/SGX from sh7372 INTCS

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

intc-sh7377.c

arm: Cleanup the irq namespace

2011-03-29 14:47:57 +02:00

Kconfig

ARM: mach-shmobile: AG5EVM LCDC / MIPI-DSI platform data

2011-01-20 21:34:32 +09:00

localtimer.c

ARM: 6759/1: smp: Select local timers vs broadcast timer support runtime

2011-02-23 17:54:27 +00:00

Makefile

ARM: mach-shmobile: CPUIdle support

2011-05-25 11:19:23 +09:00

Makefile.boot

…

pfc-sh73a0.c

ARM: mach-shmobile: sh73a0 GPIO pullup improvement

2010-12-22 16:35:50 +09:00

pfc-sh7367.c

…

pfc-sh7372.c

ARM: mach-shmobile: pfc-sh7372: modify wrong comment

2010-09-14 17:20:13 +09:00

pfc-sh7377.c

…

platsmp.c

ARM: 6993/1: platsmp: Allow secondary cpu hotplug with maxcpus=1

2011-07-07 14:45:07 +01:00

pm_runtime.c

ARM / shmobile: Use pm_genpd_poweroff_unused()

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

pm-sh7372.c

ARM / shmobile: Return -EBUSY from A4LC power off if A3RV is active

2011-07-14 20:59:35 +02:00

setup-sh73a0.c

ARM: mach-shmobile: sh73a0 DMA Engine support for SY-DMAC

2011-05-25 11:36:51 +09:00

setup-sh7367.c

ARM: mach-shmobile: Correct SCIF port types for SH7367.

2011-06-14 15:12:09 +09:00

setup-sh7372.c

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

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

setup-sh7377.c

ARM: mach-shmobile: sh7377 UIO platform data V3

2011-05-24 12:19:30 +09:00

sleep-sh7372.S

ARM: mach-shmobile: sh7372 Core Standby Suspend-to-RAM

2011-05-25 11:19:20 +09:00

smp-sh73a0.c

ARM: mach-shmobile: sh73a0 twd_base fix

2011-05-24 12:31:17 +09:00

suspend.c

ARM: mach-shmobile: Suspend-to-RAM support

2011-05-25 11:19:17 +09:00

timer.c

…