From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 24 Apr 2013 18:33:46 +0000 (+0200)
Subject: Merge branch 'linus' into timers/core
X-Git-Tag: firefly_0821_release~3680^2~653^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6402c7dc2a19c19bd8cdc7d80878b850da418942;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linus' into timers/core
Reason: Get upstream fixes before adding conflicting code.

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

6402c7dc2a19c19bd8cdc7d80878b850da418942