tree b0cc2cb7d86e228da458cd083a113d075541d700
parent 7aeb6d7d20185b7cede1ce5f6bd8d762e49bda6d
parent 0f101fa6bccdc797ddcee40fd4c55e879155a40f
parent 254248313aed7e6ff295ca21a82ca989b1f69c16
author Takashi Iwai <tiwai@suse.de> 1226336326 +0100
committer Takashi Iwai <tiwai@suse.de> 1226336326 +0100

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