From: Thomas Gleixner <tglx@linutronix.de>
Date: Sun, 15 Jul 2012 08:24:53 +0000 (+0200)
Subject: Merge branch 'timers/urgent' into timers/core
X-Git-Tag: v3.6-rc1~165^2~8
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8b9dd7e2471b1274e3be719fcc385e0a710e46f;p=pandora-kernel.git

Merge branch 'timers/urgent' into timers/core

Reason: Update to upstream changes to avoid further conflicts.
Fixup a trivial merge conflict in kernel/time/tick-sched.c

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

e8b9dd7e2471b1274e3be719fcc385e0a710e46f
Reading git-diff-tree failed