From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 30 Jul 2011 06:31:22 +0000 (-0700)
Subject: Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=49267fc82ad2825132be3b016d8eb58a90cb0c36;p=~shefty%2Frdma-dev.git

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: zynq: remove incorrectly deleted file
  ARM: tegra: only select MACH_HAS_SND_SOC_TEGRA_WM8903 if SND_SOC
---

49267fc82ad2825132be3b016d8eb58a90cb0c36