From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 16 Nov 2011 00:44:45 +0000 (-0200)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v3.2-rc3~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff0ff78068dd8a962358dbbdafa9d6f24540d3e5;p=profile%2Fivi%2Fkernel-x86-ivi.git

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

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: lantiq: use export.h in favour of module.h
  MAINTAINERS: The MIPS git tree has moved.
  MIPS: Fix build error due to missing inclusion of <linux/export.h>.
  MIPS: ASID conflict after CPU hotplug
  MIPS: Octeon: Fix compile error in arch/mips/cavium-octeon/flash_setup.c
  MIPS: errloongson2_clock: Fix build error by including linux/module.h
  STAGING: octeon-ethernet: Fix compile error caused by skb_frag_struct change
  MIPS: Hook up process_vm_readv and process_vm_writev system calls.
  MIPS: Kernel hangs occasionally during boot.
  MIPS: Octeon: Mark SMP-IPI interrupt as IRQF_NO_THREAD
  MIPS: BCM47xx: fix build with GENERIC_GPIO configuration
  MIPS: NXP: Remove unused source files.
  MIPS: Yosemite, Emma: Fix off-by-two in arcs_cmdline buffer size check
---

ff0ff78068dd8a962358dbbdafa9d6f24540d3e5