aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds2011-07-29 23:31:22 -0700
committerLinus Torvalds2011-07-29 23:31:22 -0700
commit49267fc82ad2825132be3b016d8eb58a90cb0c36 (patch)
tree9a3bf3f8ddd18a3cea89fc5ed039b03a9bbf808e /drivers
parent2313bcdcc9ff1e42f51b200dc65ddaae14c347f4 (diff)
parent18cb63b3f3ee4abd483544a664f0e720c7e5fd9f (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
Diffstat (limited to 'drivers')
0 files changed, 0 insertions, 0 deletions