From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: Tue, 20 May 2014 00:21:48 +0000 (+1000)
Subject: Merge branch 'merge' into next
X-Git-Tag: v3.16-rc1~51^2~38
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c534bbe5634bcc84cab0665fe8961df2c220aeec;p=linux.git

Merge branch 'merge' into next

Merge "merge" branch to get two fairly important bug fixes:

powerpc/powernv: Reset root port in firmware
powerpc: irq work racing with timer interrupt can result in timer interrupt
---

c534bbe5634bcc84cab0665fe8961df2c220aeec