diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 08:31:22 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-30 08:31:22 +0200 |
| commit | 49267fc82ad2825132be3b016d8eb58a90cb0c36 (patch) | |
| tree | 9a3bf3f8ddd18a3cea89fc5ed039b03a9bbf808e /arch/arm/mach-mx5/mx51_efika.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog (diff) | |
| parent | ARM: zynq: remove incorrectly deleted file (diff) | |
| download | linux-49267fc82ad2825132be3b016d8eb58a90cb0c36.tar.xz linux-49267fc82ad2825132be3b016d8eb58a90cb0c36.zip | |
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
Diffstat (limited to 'arch/arm/mach-mx5/mx51_efika.c')
0 files changed, 0 insertions, 0 deletions