From: Benjamin Herrenschmidt Date: Tue, 20 May 2014 00:21:48 +0000 (+1000) Subject: Merge branch 'merge' into next X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=c534bbe5634bcc84cab0665fe8961df2c220aeec;p=openwrt%2Fstaging%2Fblogic.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