Merge of 2.6.32-rc3 into fix/asoc

Merge of 2.6.32-rc3 into fix/asoc

[Mark Brown]

I've pushed an update of the fix/asoc branch which has 2.6.32-rc3 merged
up to my git.  This gets underlying platform support from other trees
into the branch and will also (once it's merged up there) give topic/asoc
access to things like the genirq improvements for I2C and SPI devices
which were merged during the merge window.

The following changes since commit e655a43544bd3c45a83da93b00a4b115b4fa758e:
  Jonathan Cameron (1):
        ASoC: wm8940: Fix check on error code form snd_soc_codec_set_cache_io

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.32-merge

Changelog omitted - the only changes since your fix/asoc should be those
from Linus' tree and the merge commit.

Re: Merge of 2.6.32-rc3 into fix/asoc

[Takashi Iwai]

At Tue, 6 Oct 2009 13:03:23 +0100,
Mark Brown wrote:
> 
> I've pushed an update of the fix/asoc branch which has 2.6.32-rc3 merged
> up to my git.  This gets underlying platform support from other trees
> into the branch and will also (once it's merged up there) give topic/asoc
> access to things like the genirq improvements for I2C and SPI devices
> which were merged during the merge window.

Thanks, I wanted to do this some time, too.
Now pulled it to fix/asoc branch.


Takashi

Re: Merge of 2.6.32-rc3 into fix/asoc

[Mark Brown]

On Tue, Oct 06, 2009 at 02:44:14PM +0200, Takashi Iwai wrote:

> Thanks, I wanted to do this some time, too.
> Now pulled it to fix/asoc branch.

Thanks.  I've got a few new commits queued up for topic/asoc - do you
want me to send two pull requests, one with the new commits and then a
subsequent one with the merge, or is it OK to just send a single request
for the lot (which would have an enormous changelog but the same result)?

Re: Merge of 2.6.32-rc3 into fix/asoc

[Takashi Iwai]

At Tue, 6 Oct 2009 13:47:06 +0100,
Mark Brown wrote:
> 
> On Tue, Oct 06, 2009 at 02:44:14PM +0200, Takashi Iwai wrote:
> 
> > Thanks, I wanted to do this some time, too.
> > Now pulled it to fix/asoc branch.
> 
> Thanks.  I've got a few new commits queued up for topic/asoc - do you
> want me to send two pull requests, one with the new commits and then a
> subsequent one with the merge, or is it OK to just send a single request
> for the lot (which would have an enormous changelog but the same result)?

I'm fine with the single request.  You can omit the changelog by hand :) 


thanks,

Takashi