From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 29 Jul 2015 22:13:24 +0000 (+0200)
Subject: Merge branch 'linus' into irq/core
X-Git-Tag: omap-for-v4.3/fixes-rc1~130^2~44
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b979e4c611ce750d32b51737f837b485f43c69b;p=pandora-kernel.git

Merge branch 'linus' into irq/core

Pull in upstream fixes before applying conflicting changes
---

4b979e4c611ce750d32b51737f837b485f43c69b
Reading git-diff-tree failed