From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 10 Jul 2015 23:54:37 +0000 (-0700)
Subject: Merge branch 'parisc-4.2-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: firefly_0821_release~176^2~1441
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=b9243b5a5d2da4eb0a54950f4e2d6272863b48be;p=firefly-linux-kernel-4.4.55.git

Merge branch 'parisc-4.2-1' of git://git./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
---

b9243b5a5d2da4eb0a54950f4e2d6272863b48be