[GIT PULL] Merge fix for next

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Takashi,

Thought I'd better not sit on this one.

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(-)


_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel


[Index of Archives]     [ALSA User]     [Linux Audio Users]     [Kernel Archive]     [Asterisk PBX]     [Photo Sharing]     [Linux Sound]     [Video 4 Linux]     [Gimp]     [Yosemite News]

  Powered by Linux