From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 16 Aug 2015 22:39:31 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: firefly_0821_release~176^2~1267
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=0f405bf75ffcf2abe64fb735facd4ef7b89df27f;p=firefly-linux-kernel-4.4.55.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS bugfix from Ralf Baechle:
 "Only a single MIPS fix - the math when invoking syscall_trace_enter
  was wrong"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Fix seccomp syscall argument for MIPS64
---

0f405bf75ffcf2abe64fb735facd4ef7b89df27f