From: Olof Johansson <olof@lixom.net>
Date: Fri, 12 Jul 2013 18:06:01 +0000 (-0700)
Subject: Merge tag 'ux500-defconfig-for-arm-soc' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: upstream/snapshot3+hdmi~4701^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1b4fcb8558737d61bbccfcb0f73ea4fc988fa2ab;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

Merge tag 'ux500-defconfig-for-arm-soc' of git://git./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>
---

1b4fcb8558737d61bbccfcb0f73ea4fc988fa2ab