]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
Merge branch 'topic/asoc' into for-next
authorTakashi Iwai <tiwai@suse.de>
Sun, 17 Oct 2010 08:14:41 +0000 (10:14 +0200)
committerTakashi Iwai <tiwai@suse.de>
Sun, 17 Oct 2010 08:14:41 +0000 (10:14 +0200)
Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c

1  2 
arch/powerpc/platforms/85xx/p1022_ds.c