Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:31:22 +0000 (23:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 30 Jul 2011 06:31:22 +0000 (23:31 -0700)
commit49267fc82ad2825132be3b016d8eb58a90cb0c36
tree9a3bf3f8ddd18a3cea89fc5ed039b03a9bbf808e
parent2313bcdcc9ff1e42f51b200dc65ddaae14c347f4
parent18cb63b3f3ee4abd483544a664f0e720c7e5fd9f
Merge branch 'fixes' of git://git./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