diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 17:06:15 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-08-23 17:06:15 +0200 |
| commit | 5f870baa18656be6dae856f96e3b2426ae83d69b (patch) | |
| tree | 55be6bca56ecc1b9ffcf391fd975cc646246ca5f /include/linux/nfc.h | |
| parent | 8917da43cc399a9bcea0b4f69e6b411261468e91 (diff) | |
| parent | 46a8b9837da20206c6daca11949485fab7b6e875 (diff) | |
Merge tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into fixes
From Linus Walleij <linus.walleij@linaro.org>:
Here are two audio fixes for the ux500 found by Lee Jones.
* tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
ARM: ux500: Ensure probing of Audio devices when Device Tree is enabled
ARM: ux500: Fix merge error, no matching driver name for 'snd_soc_u8500'
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/linux/nfc.h')
0 files changed, 0 insertions, 0 deletions