]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/asoc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Mon, 25 Oct 2010 08:00:30 +0000 (10:00 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 25 Oct 2010 08:00:30 +0000 (10:00 +0200)
commit7d53d23d61e751432f0df2e9800b0ce1f058555c
tree0114637e8be2b38176e7e91e6cea3501b22cb66a
parent264d1381648a2bfb46bc37842e268ee3250cf80f
parent6a83e0b35ae5161260d2d778f3b7568e3eeb1d4c
Merge branch 'topic/asoc' into for-linus

Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
arch/powerpc/platforms/85xx/p1022_ds.c
sound/soc/davinci/davinci-sffsdr.c
sound/soc/s3c24xx/neo1973_gta02_wm8753.c
sound/soc/s3c24xx/neo1973_wm8753.c
sound/soc/s3c24xx/s3c-dma.c