Thomas Gleixner 47916be4e2 Merge branch 'powerpc.cherry-picks' into timers/clocksource ...

Conflicts:
	arch/powerpc/kernel/time.c

Reason: The powerpc next tree contains two commits which conflict with
the timekeeping changes:

8fd63a9e powerpc: Rework VDSO gettimeofday to prevent time going backwards
c1aa687d powerpc: Clean up obsolete code relating to decrementer and timebase

John Stultz identified them and provided the conflict resolution.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

2010-07-28 21:49:22 +02:00

..

alpha

time: Kill off CONFIG_GENERIC_TIME

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

arm

time: Kill off CONFIG_GENERIC_TIME

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

avr32

time: Kill off CONFIG_GENERIC_TIME

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

blackfin

time: Kill off CONFIG_GENERIC_TIME

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

cris

time: Kill off CONFIG_GENERIC_TIME

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

frv

time: Kill off CONFIG_GENERIC_TIME

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

h8300

time: Kill off CONFIG_GENERIC_TIME

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

ia64

timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset

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

m32r

time: Kill off CONFIG_GENERIC_TIME

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

m68k

time: Kill off CONFIG_GENERIC_TIME

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

m68knommu

time: Kill off CONFIG_GENERIC_TIME

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

microblaze

time: Kill off CONFIG_GENERIC_TIME

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

mips

time: Kill off CONFIG_GENERIC_TIME

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

mn10300

time: Kill off CONFIG_GENERIC_TIME

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

parisc

time: Kill off CONFIG_GENERIC_TIME

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

powerpc

Merge branch 'powerpc.cherry-picks' into timers/clocksource

2010-07-28 21:49:22 +02:00

s390

timkeeping: Fix update_vsyscall to provide wall_to_monotonic offset

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

score

time: Kill off CONFIG_GENERIC_TIME

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

sh

time: Kill off CONFIG_GENERIC_TIME

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

sparc

time: Kill off CONFIG_GENERIC_TIME

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

um

um: Convert to use read_persistent_clock

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

x86

x86: Convert common clocksources to use clocksource_register_hz/khz

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

xtensa

time: Kill off CONFIG_GENERIC_TIME

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

.gitignore

…

Kconfig

hw-breakpoints: Separate constraint space for data and instruction breakpoints

2010-05-01 04:32:11 +02:00