Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2014 22:54:44 +0000 (15:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 May 2014 22:54:44 +0000 (15:54 -0700)
commitb5f3c61d06165c3dddddbc30772f079c2c8589ca
tree2ae46c338afddb252ed72324ef1ac09ff038c489
parentba6728f596a60c4b161722c825883692a3606011
parent8a415e534dbda905b829320f90c9ce5f7359debf
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