tree 335e8d03b134030a748439993bb24d53004032a1
parent 6a8436419d1b77b24d82bd90354adc4baa393566
parent 72077aa336d0f4c5e3c7014d7471c79bc69873bb
author Takashi Iwai <tiwai@suse.de> 1229812980 +0100
committer Takashi Iwai <tiwai@suse.de> 1229812980 +0100

Merge branch 'topic/ca0106-resume' into topic/ca0106