Merge branch 'topic/core-cleanup' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 13 Apr 2010 10:57:59 +0000 (12:57 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 13 Apr 2010 10:57:59 +0000 (12:57 +0200)
Conflicts:
sound/soc/codecs/ad1938.c


Trivial merge