Merge branch 'merge' into next
authorBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 May 2014 00:21:48 +0000 (10:21 +1000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Tue, 20 May 2014 00:21:48 +0000 (10:21 +1000)
commitc534bbe5634bcc84cab0665fe8961df2c220aeec
treef2eae06abf1153c17dfd996f96dfe8a35851e9dc
parent965b5608f7da181923d766b83ead06cbdc7dd4b3
parent8050936caf125fbe54111ba5e696b68a360556ba
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