Merge branch 'kirkwood_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux...
authorOlof Johansson <olof@lixom.net>
Wed, 9 May 2012 06:55:17 +0000 (23:55 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 9 May 2012 07:05:25 +0000 (00:05 -0700)
By Ben Hutchings (1) and Ian Campbell (1)
via Jason Cooper: "ARM: kirkwood: fixes for v3.4"
* 'kirkwood_fixes_for_v3.4' of git://git.infradead.org/users/jcooper/linux-kirkwood:
  ARM: orion5x: Fix GPIO enable bits for MPP9
  ARM: kirkwood: add missing kexec.h include


Trivial merge