Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Aug 2015 22:39:31 +0000 (15:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 16 Aug 2015 22:39:31 +0000 (15:39 -0700)
commit0f405bf75ffcf2abe64fb735facd4ef7b89df27f
tree4928846c34bb9c70807154d61600b3220ea431cd
parent01565479e99882e873e4dd2f6f067b7cba3acf8f
parent9f161439e4104b641a7bfb9b89581d801159fec8
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