| commit | 49267fc82ad2825132be3b016d8eb58a90cb0c36 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 29 23:31:22 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Jul 29 23:31:22 2011 -0700 |
| tree | 9a3bf3f8ddd18a3cea89fc5ed039b03a9bbf808e | |
| parent | 2313bcdcc9ff1e42f51b200dc65ddaae14c347f4 [diff] | |
| parent | 18cb63b3f3ee4abd483544a664f0e720c7e5fd9f [diff] |
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