Merge branch 'fixes-for-arm-soc-20120416' of git://git.kernel.org/pub/scm/linux/kerne...
authorOlof Johansson <olof@lixom.net>
Thu, 19 Apr 2012 04:28:16 +0000 (21:28 -0700)
committerOlof Johansson <olof@lixom.net>
Thu, 19 Apr 2012 04:28:16 +0000 (21:28 -0700)
* '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


Trivial merge