From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 2 Aug 2013 21:36:32 +0000 (-0700)
Subject: Merge branch 'parisc-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/delle... 
X-Git-Tag: v3.11-rc4~13
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=efc681641516868d5ced1f82c857a317da6159b2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

Merge branch 'parisc-3.11-rc4' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc updates from Helge Deller:
 "The majority of lines changed are due the addition of a defconfig for
  the C8000 machine.  Even the fix in parisc/kernel/cache.c file is
  actually ony a 10-line fix, but the change became bigger (and much
  nicer) to avoid errors of the checkpatch script.

  Here is the short-changelog:

  This round of parisc updates includes mostly fixes for the C8000
  workstation.  We have a new defconfig file for this machine, as well
  as fixes for it's serial port, the AGP driver and the cache routines
  to cope with the vmas of the FireGL card in a C8000.  The sys32.h
  header file was not used and as such it's now gone"

* 'parisc-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Fix interrupt routing for C8000 serial ports
  parisc: Remove arch/parisc/kernel/sys32.h header
  parisc: add defconfig for c8000 machine
  parisc: agp/parisc-agp: allow binding of user memory to the AGP GART
  parisc: Fix cache routines to ignore vma's with an invalid pfn
---

efc681641516868d5ced1f82c857a317da6159b2