From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 18 May 2011 20:21:43 +0000 (-0700)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus
X-Git-Tag: firefly_0821_release~7613^2~1416
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7103dbed8e462f2a065381d23fde086cbd5b9891;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: Kludge IP27 build for 2.6.39.
  MIPS: AR7: Fix GPIO register size for Titan variant.
  MIPS: Fix duplicate invocation of notify_die.
  MIPS: RB532: Fix iomap resource size miscalculation.
---

7103dbed8e462f2a065381d23fde086cbd5b9891