tree bac534a1d5798e3d07d29e8dd8a5f5f2f5ef20fb
parent 0a9b86381c76e9d33a9b6edb66aef32d7a3306e3
parent 0cbf00980f0fc4cc064a15ab3dfce19b5fae9130
parent 366840d7e1ece4331bb3ccc2a53e3bc355529f21
author Takashi Iwai <tiwai@suse.de> 1225294800 +0100
committer Takashi Iwai <tiwai@suse.de> 1225294800 +0100

Merge branches 'topic/fix/hda' and 'topic/fix/misc' into for-linus