From: Olof Johansson <olof@lixom.net>
Date: Sun, 17 Jun 2012 01:36:52 +0000 (-0700)
Subject: Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
X-Git-Tag: firefly_0821_release~3680^2~2597^2~2
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7dea9e73614ba37914b8867dd0fef49193b22b8d;p=firefly-linux-kernel-4.4.55.git

Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes

* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: mmp: fix missing cascade_irq in irq handler
  ARM: dts: update memory size on brownstone
---

7dea9e73614ba37914b8867dd0fef49193b22b8d