projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8917da4 46a8b98)
Merge tag 'ux500-fixes-v3.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Thu, 23 Aug 2012 15:06:15 +0000 (17:06 +0200)
committerArnd Bergmann <arnd@arndb.de>
Thu, 23 Aug 2012 15:06:15 +0000 (17:06 +0200)
commit5f870baa18656be6dae856f96e3b2426ae83d69b
tree55be6bca56ecc1b9ffcf391fd975cc646246ca5ftree | snapshot (tar.gz zip)
parent8917da43cc399a9bcea0b4f69e6b411261468e91commit | diff
parent46a8b9837da20206c6daca11949485fab7b6e875commit | diff
Merge tag 'ux500-fixes-v3.6-rc2' of git://git./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>