tree f2eae06abf1153c17dfd996f96dfe8a35851e9dc
parent 965b5608f7da181923d766b83ead06cbdc7dd4b3
parent 8050936caf125fbe54111ba5e696b68a360556ba
author Benjamin Herrenschmidt <benh@kernel.crashing.org> 1400545308 +1000
committer Benjamin Herrenschmidt <benh@kernel.crashing.org> 1400545308 +1000

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