Merge branch 'upstream' into topic/asoc
authorTakashi Iwai <tiwai@suse.de>
Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 1 Dec 2008 17:02:17 +0000 (18:02 +0100)
commit3af4182cc5be7d5505f9801ee3297373f1872446
tree214348d40ed547a72f9612a7e5c94a01afded812
parentf5d4c67e41a262f0cdfaec1bb0fa8e5952187ef9
parentc07f62e5f18123103459ff74e86af1518a5b8af5
Merge branch 'upstream' into topic/asoc
MAINTAINERS
sound/soc/soc-core.c