git.maquefel.me Git - linux.git/commit

author	Mark Brown <broonie@linaro.org>
	Thu, 15 Aug 2013 10:37:38 +0000 (11:37 +0100)
committer	Mark Brown <broonie@linaro.org>
	Thu, 15 Aug 2013 10:37:38 +0000 (11:37 +0100)
commit	743c5bb898be45009770c144e5e14e4f448e56b9
tree	40fff57c975f89da4a90922c165595840e99093a	tree \| snapshot
parent	8fe120b5a665fc869c23f86e4964b801f6e53486	commit \| diff
parent	b7ae6f31d8243ec684af16bc5c763eccdfabaec0	commit \| diff

Merge branch 'topic/dma' of git://git./linux/kernel/git/broonie/sound into asoc-omap

Conflicts:
sound/soc/omap/Kconfig

ep93xx device tree rework repo: git://git.maquefel.me/linux.git