From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 22 Oct 2008 07:48:06 +0000 (+0200)
Subject: Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2
X-Git-Tag: v2.6.28-rc1~18^2
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=268a3dcfea2077fca60d3715caa5c96f9b5e6ea7;hp=268a3dcfea2077fca60d3715caa5c96f9b5e6ea7;p=linux-2.6-omap-h63xx.git

Merge branch 'timers/range-hrtimers' into v28-range-hrtimers-for-linus-v2

Conflicts:

	kernel/time/tick-sched.c

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