Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel...

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

From Linus Walleij:
Ux500 defconfig changes:
- Update base due to different Kconfig changes
- Select watchdog, MUSB, Ux500 ALSA SoC, various MMC/SD
  features and enable highmem

* tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: Enable HIGHMEM in the u8500 defconfig
  ARM: ux500: Update MMC configs for u8500 defconfig
  ARM: ux500: select SND_SOC_UX500 for ux500
  ARM: ux500: update defconfig base
  ARM: ux500: select WATCHDOG and MUSB for ux500

Signed-off-by: Olof Johansson <olof@lixom.net>