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

author	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 7 Jul 2009 18:18:46 +0000 (19:18 +0100)
committer	Mark Brown <broonie@opensource.wolfsonmicro.com>
	Tue, 7 Jul 2009 18:18:46 +0000 (19:18 +0100)
commit	d2aa48b087c1f89c59d1a11a87f20e3e5171c3d3
tree	46d8032c9f224d28f258c44727a7165c9ba47c85	tree \| snapshot
parent	2a4cc7dd3d2928f62019ff8a58eaac2fee5ffbf2	commit \| diff
parent	a94cd88520ebf919577e97329b5cf9b52fc268b4	commit \| diff

Merge branch 'davinci' into for-2.6.32

Conflicts:
sound/soc/davinci/davinci-i2s.c