| commit | c534bbe5634bcc84cab0665fe8961df2c220aeec | [log] [tgz] |
|---|---|---|
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Tue May 20 10:21:48 2014 +1000 |
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | Tue May 20 10:21:48 2014 +1000 |
| tree | f2eae06abf1153c17dfd996f96dfe8a35851e9dc | |
| parent | 965b5608f7da181923d766b83ead06cbdc7dd4b3 [diff] | |
| parent | 8050936caf125fbe54111ba5e696b68a360556ba [diff] |
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