From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 1 Jun 2013 21:24:54 +0000 (+0900)
Subject: Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/paris... 
X-Git-Tag: v3.10-rc4~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cc8639739250a4a5bbfb29abffdab8ff2c8ab1b6;p=profile%2Fcommon%2Fkernel-common.git

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

Pull parisc fixes from Helge Deller:
 "This patcheset includes fixes for:

   - the PCI/LBA which brings back the stifb graphics framebuffer
     console
   - possible memory overflows in parisc kernel init code
   - parport support on older GSC machines
   - avoids that users by mistake enable PARPORT_PC_SUPERIO on parisc
   - MAINTAINERS file list updates for parisc."

* 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: parport0: fix this legacy no-device port driver!
  parport_pc: disable PARPORT_PC_SUPERIO on parisc architecture
  parisc/PCI: lba: fix: convert to pci_create_root_bus() for correct root bus resources (v2)
  parisc/PCI: Set type for LBA bus_num resource
  MAINTAINERS: update parisc architecture file list
  parisc: kernel: using strlcpy() instead of strcpy()
  parisc: rename "CONFIG_PA7100" to "CONFIG_PA7000"
  parisc: fix kernel BUG at arch/parisc/include/asm/mmzone.h:50
  parisc: memory overflow, 'name' length is too short for using
---

cc8639739250a4a5bbfb29abffdab8ff2c8ab1b6