From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 26 May 2013 16:36:31 +0000 (-0700)
Subject: Merge branch 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/delle... 
X-Git-Tag: v3.12-rc1~734
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=95f4838e21945b9d9718f55afeb7edc8c39858b9;p=kernel%2Fkernel-generic.git

Merge branch 'parisc-for-3.10' of git://git./linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "This time we made the kernel- and interruption stack allocation
  reentrant which fixed some strange kernel crashes (specifically
  protection ID traps).

  Furthemore this patchset fixes the interrupt stack in UP and SMP
  configurations by using native locking instructions.  And finally
  usage of floating point calculations on parisc were disabled in the
  MPILIB."

* 'parisc-for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: fix irq stack on UP and SMP
  parisc/superio: Use module_pci_driver to register driver
  parisc: make interrupt and interruption stack allocation reentrant
  parisc: show number of FPE and unaligned access handler calls in /proc/interrupts
  parisc: add additional parisc git tree to MAINTAINERS file
  parisc: use PAGE_SHIFT instead of hardcoded value 12 in pacache.S
  parisc: add rp5470 entry to machine database
  MPILIB: disable usage of floating point registers on parisc
---

95f4838e21945b9d9718f55afeb7edc8c39858b9