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)
commit7dea9e73614ba37914b8867dd0fef49193b22b8d
treec2b5598c9f266ce2ee8f94795e560d2a4d28d5fe
parentf9c15a1b7d60b69f42b2808140a4713808a3bec1
parent10bd21c0547ba2834374ccdddbc6a984eeed432c
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