[alsa-devel] [GIT PULL] Merge fix for next

[Takashi Iwai]

At Mon, 04 Oct 2010 20:55:33 +0100,
Liam Girdwood wrote:
> 
> Hi Takashi,
> 
> Thought I'd better not sit on this one.

Pulled now.  It's just a juggling, so little harm :)


thanks,

Takashi


> Thanks
> 
> Liam
> 
> ---
> 
> 
> The following changes since commit 0b452f2efa35c48219d1ad3cbebdd786ec39ef06:
>   Takashi Iwai (1):
>         Merge branch 'for-2.6.37' of git://git.kernel.org/.../lrg/asoc-2.6 into topic/asoc
> 
> are available in the git repository at:
> 
>   git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6.git for-2.6.37
> 
> Jarkko Nikula (1):
>       omap: devices: Avoid merge conflict between ASoC and OMAP hwmod changes
> 
>  arch/arm/mach-omap2/devices.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
>