From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Oct 2010 20:18:21 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~7613^2~3747
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7d7c4d06be246b249f0f7e0b7df2f73d09cc6376;p=firefly-linux-kernel-4.4.55.git

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

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: O32 compat/N32: Fix to use compat syscall wrappers for AIO syscalls.
  MAINTAINERS: Change list for ioc_serial to linux-serial.
  SERIAL: ioc3_serial: Return -ENOMEM on memory allocation failure
  MIPS: jz4740: Fix Kbuild Platform file.
  MIPS: Repair Kbuild make clean breakage.
---

7d7c4d06be246b249f0f7e0b7df2f73d09cc6376