From: Thomas Gleixner <tglx@linutronix.de>
Date: Mon, 4 Feb 2013 10:03:03 +0000 (+0100)
Subject: Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into... 
X-Git-Tag: v3.9-rc1~170^2~5
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90889a635a9b5488624bccce3ff6b2eec68c007b;p=pandora-kernel.git

Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core

Trivial conflict in arch/x86/Kconfig

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

90889a635a9b5488624bccce3ff6b2eec68c007b
Reading git-diff-tree failed