From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 21 Nov 2012 19:31:52 +0000 (+0100)
Subject: Merge branch 'fortglx/3.8/time' of git://git.linaro.org/people/jstultz/linux into... 
X-Git-Tag: omap-for-v3.8/fixes-for-merge-window-v4-signed~74^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9c3f9e281697d02889c3b08922f3b30be75f56c2;p=pandora-kernel.git

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

Fix trivial conflicts in: kernel/time/tick-sched.c

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

9c3f9e281697d02889c3b08922f3b30be75f56c2
Reading git-diff-tree failed