linux/drivers/sh
Paul Mundt e0a23ce20e Merge branches 'common/pfc' and 'common/clkfwk' into rmobile/marzen
Conflicts:
	arch/arm/mach-shmobile/clock-sh73a0.c

Signed-off-by: Paul Mundt <lethal@linux-sh.org>
2012-01-09 10:03:09 +09:00
..
clk sh: use ioread32/iowrite32 and mapped_reg for div6 2011-12-09 18:04:14 +09:00
intc Merge branch 'pm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 2012-01-08 13:10:57 -08:00
maple sh: Add module.h to arch/sh specific files as required. 2011-10-31 19:31:04 -04:00
superhyway
Kconfig
Makefile drivers: sh: Generalize runtime PM platform stub. 2011-11-11 15:41:50 +09:00
pfc.c sh: pfc: Unlock register support 2012-01-09 09:33:57 +09:00
pm_runtime.c drivers: sh: Kill off dead pathname for runtime PM stub. 2011-11-11 15:58:50 +09:00