Merge branch 'merge' into next

Browse source

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

...

This commit is contained in:

Benjamin Herrenschmidt 2014-05-20 10:21:48 +10:00

parent 965b5608f7 8050936caf

commit c534bbe563

1 changed files with 0 additions and 3 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

3

arch/powerpc/kernel/time.c

View file