tree 6c877c7a938758b1323d9c97d46b9c536e618c69
parent 19008bdacb9f7841166ebafe0aef361ee582ffbf
parent ad8332c1302bcb4f80d593fd3eb477be9d7f5604
author Takashi Iwai <tiwai@suse.de> 1274349643 +0200
committer Takashi Iwai <tiwai@suse.de> 1274349643 +0200

Merge branch 'topic/asoc' into for-linus

Conflicts:
	sound/soc/codecs/ad1938.c