projects / openwrt / staging / blogic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0156547 9f16143)
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)
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


Trivial merge
John Crispins staging tree