From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 31 May 2015 19:03:42 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux
X-Git-Tag: v4.1-rc6~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e4ca714b6363bbb4c8a6020482028815fc6d947f;p=linux.git

Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux

Pull MIPS fixes from Ralf Baechle:
 "MIPS fixes for 4.1 all across the tree"

* 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/ralf/linux:
  MIPS: strnlen_user.S: Fix a CPU_DADDI_WORKAROUNDS regression
  MIPS: BMIPS: Fix bmips_wr_vec()
  MIPS: ath79: fix build problem if CONFIG_BLK_DEV_INITRD is not set
  MIPS: Fuloong 2E: Replace CONFIG_USB_ISP1760_HCD by CONFIG_USB_ISP1760
  MIPS: irq: Use DECLARE_BITMAP
  ttyFDC: Fix to use native endian MMIO reads
  MIPS: Fix CDMM to use native endian MMIO reads
---

e4ca714b6363bbb4c8a6020482028815fc6d947f