git.baikalelectronics.ru Git - kernel.git/commit

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Thu, 21 Apr 2011 11:00:27 +0000 (12:00 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Thu, 21 Apr 2011 11:00:27 +0000 (12:00 +0100)
commit	64edf97d5da525ef416a8641cd697fd23b76deb3
tree	41dd8005dbeb839c9c92c1ab310e160f405c47df	tree \| snapshot
parent	dee2820867f896d22d47ac5a8dde2708f69819a9	commit \| diff
parent	d5a492625aa5c8a216d5e66d153b11c7b49e888e	commit \| diff

Merge branch 'tegra' into for-2.6.40

Fix up merge with Harmony driver rename.

Conflicts:
sound/soc/tegra/Kconfig