From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 18 Jul 2012 09:24:41 +0000 (+0200)
Subject: Merge branch 'linus' into timers/core
X-Git-Tag: v3.6-rc1~165^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eec19d1a0d04c80e66eef634f7b8f460f2ca5643;p=pandora-kernel.git

Merge branch 'linus' into timers/core

Resolve semantic conflict in kernel/time/timekeeping.c.

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

eec19d1a0d04c80e66eef634f7b8f460f2ca5643
Reading git-diff-tree failed