From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 1 May 2014 22:54:44 +0000 (-0700)
Subject: Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Tag: v4.0~1930
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b5f3c61d06165c3dddddbc30772f079c2c8589ca;p=platform%2Fkernel%2Flinux-amlogic.git

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

Pull parisc fixes from Helge Deller:
 "Drop the architecture-specifc value for_STK_LIM_MAX to fix stack
  related problems with GNU make"

* 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Use generic uapi/asm/resource.h file
  parisc: remove _STK_LIM_MAX override
---

b5f3c61d06165c3dddddbc30772f079c2c8589ca