OSDN Git Service

(root) / uclinux-h8 / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 8fe120b b7ae6f3)
Merge branch 'topic/dma' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:38 +0000 (11:37 +0100)
committerMark Brown <broonie@linaro.org>
Thu, 15 Aug 2013 10:37:38 +0000 (11:37 +0100)
commit743c5bb898be45009770c144e5e14e4f448e56b9
tree40fff57c975f89da4a90922c165595840e99093atree | snapshot
parent8fe120b5a665fc869c23f86e4964b801f6e53486commit | diff
parentb7ae6f31d8243ec684af16bc5c763eccdfabaec0commit | diff
Merge branch 'topic/dma' of git://git./linux/kernel/git/broonie/sound into asoc-omap

Conflicts:
sound/soc/omap/Kconfig
sound/soc/omap/Kconfig diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help