From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Mar 2016 17:46:19 +0000 (-0800)
Subject: Merge branch 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f983cd32cd5d2ec47ac8868f387bad15e8f11f85;p=openwrt%2Fstaging%2Fblogic.git

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

Pull parisc fixes from Helge Deller:
 "We wire up the copy_file_range syscall, fix two bugs in the parisc
  ptrace code and have a trivial fix for floppy.h to clarify an
  expression with parentheses"

* 'parisc-4.5-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
  parisc: Wire up copy_file_range syscall
  parisc: Fix ptrace syscall number and return value modification
  parisc: Use parentheses around expression in floppy.h
---

f983cd32cd5d2ec47ac8868f387bad15e8f11f85