]> git.kernelconcepts.de Git - karo-tx-linux.git/commit
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)
commit7ad718a70f54a52a324e0fbc602bf2e94620017f
tree4fdb92ca660047e25524574829cff72308d714ba
parente0299eb30f8e01ac2ee6f458c813d84fdfa17e10
parent630f2d445f922c9dcf1bb54ffde78685e2c63072
Merge branch 'topic/asoc' into for-next

Conflicts:
arch/powerpc/platforms/85xx/p1022_ds.c
arch/powerpc/platforms/85xx/p1022_ds.c