tree 02d8f0d82b5e2419f20a85092ab5a5b894f2b461
parent 1604f8719a2dba692c12d333104fcc92613003af
parent 01ab60570427caa24b9debc369e452e86cd9beb4
author Linus Torvalds <torvalds@linux-foundation.org> 1436572477 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1436572477 -0700

Merge branch 'parisc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "We have one important patch from Dave Anglin and myself which fixes
  PTE/TLB race conditions which caused random segmentation faults on our
  debian buildd servers, and one patch from Alex Ivanov which speeds up
  the graphical text console on the STI framebuffer driver"

* 'parisc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix some PTE/TLB race conditions and optimize __flush_tlb_range based on timing results
  stifb: Implement hardware accelerated copyarea