Merge branch 'fixes' of git://github.com/hzhuang1/linux into fixes
authorOlof Johansson <olof@lixom.net>
Sun, 17 Jun 2012 01:36:52 +0000 (18:36 -0700)
committerOlof Johansson <olof@lixom.net>
Sun, 17 Jun 2012 01:36:52 +0000 (18:36 -0700)
* 'fixes' of git://github.com/hzhuang1/linux:
  ARM: mmp: fix missing cascade_irq in irq handler
  ARM: dts: update memory size on brownstone


Trivial merge