tree 3bc56f2a22d2cf29bc183b67e74e1e8c0733efc0
parent 1559f3b8d0527e24219149c95b3de5e7b2924828
parent cbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f
author Thomas Gleixner <tglx@linutronix.de> 1438208004 +0200
committer Thomas Gleixner <tglx@linutronix.de> 1438208004 +0200

Merge branch 'linus' into irq/core

Pull in upstream fixes before applying conflicting changes