Paul Mundt bbcf6e8b66 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: arch/sh/include/asm/Kbuild drivers/Makefile Signed-off-by: Paul Mundt <lethal@linux-sh.org>		2010-08-16 13:32:24 +09:00
..
maple	sh: maple: PHYSADDR() -> virt_to_phys() conversion.	2009-10-13 12:35:30 +09:00
superhyway	sh: struct device - replace bus_id with dev_name(), dev_set_name()	2009-03-24 16:38:21 -07:00
clk-cpg.c	sh: add a reparent function to DIV6 clocks	2010-08-04 16:12:01 +09:00
clk.c	sh: remove bogus highest / lowest logic from clock rate rounding	2010-07-02 18:07:51 +09:00
intc.c	sh: Make intc messages consistent via pr_fmt.	2010-06-02 18:10:00 +09:00
Kconfig	sh: intc: IRQ auto-distribution support.	2010-04-15 13:13:52 +09:00
Makefile	ARM: mach-shmobile: Use shared clock framework	2010-05-20 12:05:45 +09:00
pfc.c	sh: update PFC to allow any enum in MARK lists	2010-01-20 02:50:57 +09:00