diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-02 18:07:36 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-08-02 18:07:36 -0700 |
commit | d08c31812e5ce5867ff0fe1da68d6c375984a597 (patch) | |
tree | 9cbb8a993d6105909ff1d3009be879d0ebc914a3 /kernel/watchdog.c | |
parent | 27667f4744fc5a0f3e50910e78740bac5670d18b (diff) | |
parent | b8d65e9662b1ffb3b52a65fd11b0b968022dc6a1 (diff) | |
download | op-kernel-dev-d08c31812e5ce5867ff0fe1da68d6c375984a597.zip op-kernel-dev-d08c31812e5ce5867ff0fe1da68d6c375984a597.tar.gz |
Merge tag 'powerpc-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux
Pull powerpc fixes from Michael Ellerman:
- TCE table memory calculation fix from Alexey
- Build fix for ans-lcd from Luis
- Unbalanced IRQ warning fix from Alistair
* tag 'powerpc-4.2-3' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
powerpc/eeh-powernv: Fix unbalanced IRQ warning
macintosh/ans-lcd: fix build failure after module_init/exit relocation
powerpc/powernv/ioda2: Fix calculation for memory allocated for TCE table
Diffstat (limited to 'kernel/watchdog.c')
0 files changed, 0 insertions, 0 deletions