From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 4 Dec 2013 16:54:36 +0000 (-0800)
Subject: Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v3.13-rc3~17
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8aa9c36788ee5ebf7a1377742d577911bfc9cfe7;p=platform%2Fkernel%2Flinux-stable.git

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

Pull parsic updates from Helge Deller:
 - a fix for the mmap(MAP_FIXED|MAP_SHARED) syscall to the same address
   which was already given in a previous call (fixes locale-gen on
   debian)
 - change the memory layout of the kernel to avoid the need for the
   -mlong-calls compiler option (depends on commit 5ecbe3c3c690 -
   "kernel/extable: fix address-checks for core_kernel and init areas")
 - defconfig updates, e.g.  use the SIL680 driver instead of the SIIMAGE
   driver
 - add more parisc machine names to the machine database

* 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver
  parisc: remove CONFIG_MLONGCALLS=y from defconfigs
  parisc: fix kernel memory layout in vmlinux.ld.S
  parisc: use kernel_text_address() in unwind functions
  parisc: remove empty SERIAL_PORT_DFNS in serial.h
  parisc: add some more machine names to hardware database
  parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address
---

8aa9c36788ee5ebf7a1377742d577911bfc9cfe7