From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Jun 2013 16:23:56 +0000 (-1000)
Subject: Merge branch 'parisc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: Ubuntu-5.2.0-15.16~15480
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=aa4927b9edb74f0456d55426bfc44766eae508fe;p=mirror_ubuntu-eoan-kernel.git

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

Pull parisc fixes from Helge Deller:
 "This contains a kernel segfault fix when reading /proc/kpageflags or
  /proc/kpagecount, two fixes for the serial port and PCI graphic card
  support on C8000 workstations and a fix to use unshadowed registers
  for flushing D- and I-caches."

* 'parisc-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Use unshadowed index register for flush instructions in flush_dcache_page_asm and flush_icache_page_asm
  parisc: provide pci_mmap_page_range() for parisc
  parisc: fix serial ports on C8000 workstation
  parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50 (part 2)
---

aa4927b9edb74f0456d55426bfc44766eae508fe