tree e978a222b3bd8bcfa59f0c81a5982147b202b65e
parent b462fca45dc1823105e7ada58085fa890f531b67
parent f27962ac68a9b4cf17958522ecd7c10ce2375ee1
author Olof Johansson <olof@lixom.net> 1334809696 -0700
committer Olof Johansson <olof@lixom.net> 1334809696 -0700

Merge branch 'fixes-for-arm-soc-20120416' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes

* 'fixes-for-arm-soc-20120416' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: update defconfig
  ARM: ux500: Fix unmet direct dependency
  ARM: ux500: wake secondary cpu via resched