Merge branch 'linus' into irq/core
authorThomas Gleixner <tglx@linutronix.de>
Wed, 29 Jul 2015 22:13:24 +0000 (00:13 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Wed, 29 Jul 2015 22:13:24 +0000 (00:13 +0200)
Pull in upstream fixes before applying conflicting changes


Trivial merge