Re: [alsa-devel] ASoC updates for 2.6.31
The following changes since commit 28d0325ce6e0a52f53d8af687e6427fee59004d3: Linus Torvalds (1): Linux 2.6.31-rc1
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31
Peter Ujfalusi (1): MAINTAINERS: Add entry for twl4030 series soc codec driver
MAINTAINERS | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
At Thu, 25 Jun 2009 14:09:39 +0100, Mark Brown wrote:
The following changes since commit 28d0325ce6e0a52f53d8af687e6427fee59004d3: Linus Torvalds (1): Linux 2.6.31-rc1
are available in the git repository at:
ssh://master.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.31
Thanks. This gave me a merge error (because other entries have been added to MAINTAINERS) so I corrected manually.
So, I based my 2.6.32 asoc branch on this to avoid the doubly merge corrections, and I pulled your 2.6.32 branch there, too.
Now everything should be settled doen, you can forward gracefully by just pulling from my branches :)
Takashi
participants (2)
-
Mark Brown -
Takashi Iwai