From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 20 Mar 2014 17:57:52 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3fb725c48b93c0a152174b6dbbc1029b5e734c7b;p=openwrt%2Fstaging%2Fblogic.git

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

Pull MIPS fixes from Ralf Baechle:
 "Another set of five fixes.  The most interesting one is a fix for race
  condition in the local_irq_disable() implementation used by .S code
  for pre-MIPS R2 processors only.  It leaves a race that's hard but not
  impossible to hit; the others fairly obvious"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: Make local_irq_disable macro safe for non-Mipsr2
  MIPS: Octeon: Fix warning in of_device_alloc on cn3xxx
  MIPS: ftrace: Tweak safe_load()/safe_store() macros
  MIPS: BCM47XX: Check all (32) GPIOs when looking for a pin
  MIPS: Fix possible build error with transparent hugepages enabled
---

3fb725c48b93c0a152174b6dbbc1029b5e734c7b