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)
commitaa5c14d5c0d3e4c587db4a1b220b9c86415c538f
tree0114637e8be2b38176e7e91e6cea3501b22cb66a
parent79fc84c7e0d2fe89c4e82f3a26fd8b0d13c31703
parentb11bdb5254ff17cb63e4ae5088b73fdcd2cc2602
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