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

..

acpi_pm.c

x86: Convert common clocksources to use clocksource_register_hz/khz

2010-07-27 12:40:55 +02:00

cs5535-clockevt.c

Andres has moved

2010-07-20 16:25:41 -07:00

cyclone.c

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

Makefile

cs5535: add a generic clock event MFGPT driver

2009-12-15 08:53:28 -08:00

scx200_hrt.c

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00

sh_cmt.c

clocksource: sh_cmt: Rate calculation fix

2010-08-04 16:01:29 +09:00

sh_mtu2.c

Merge branch 'sh/stable-updates'

2010-04-26 16:08:27 +09:00

sh_tmu.c

clocksource: sh_tmu: compute mult and shift before registration

2010-06-02 17:02:35 +09:00

tcb_clksrc.c

clocksource: pass clocksource to read() callback

2009-04-21 13:41:47 -07:00