tree 2ae46c338afddb252ed72324ef1ac09ff038c489
parent ba6728f596a60c4b161722c825883692a3606011
parent 8a415e534dbda905b829320f90c9ce5f7359debf
author Linus Torvalds <torvalds@linux-foundation.org> 1398984884 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1398984884 -0700

Merge branch 'parisc-3.15-3' of git://git.kernel.org/pub/scm/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