tree be65e8d9b212e3b2f45829eb36196c885f6f31ff
parent 0246544fc9abcc5850cfc4cfcfe6c16067541024
parent 9794144d5a95ca90cb9165a0aae1af155f1d8676
author Linus Torvalds <torvalds@linux-foundation.org> 1406330226 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1406330226 -0700

Merge branch 'parisc-3.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux

Pull parisc fixes from Helge Deller:
 "We have two trivial patches in here.  One removes the SA_RESTORER
  #define since on parisc we don't have the sa_restorer field in struct
  sigaction, the other patch removes an unnecessary memset().

  The SA_RESTORER removal patch is scheduled for stable trees, since
  without it some userspace apps don't build"

* 'parisc-3.16-6' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Eliminate memset after alloc_bootmem_pages
  parisc: Remove SA_RESTORER define