From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 5 Aug 2015 21:55:52 +0000 (+0200)
Subject: Merge branch 'linus' into x86/apic
X-Git-Tag: omap-for-v4.3/fixes-rc1~129^2~11
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8;p=pandora-kernel.git

Merge branch 'linus' into x86/apic

Pull in upstream changes to avoid conflicts
---

b7edaca4e825fd5d7a6ddce3548cc1f7a7337cf8
Reading git-diff-tree failed