tree ac9765e68597c08c24de447f46bb3e04d9881e1b
parent 49ba4f94bddb7f5272c4596d505f94355cc3fbd2
parent 42c364ace52ae6b4699105b39f2559c256b6cd4c
author Takashi Iwai <tiwai@suse.de> 1358926294 +0100
committer Takashi Iwai <tiwai@suse.de> 1358926294 +0100

Merge branch 'for-linus' into for-next

This is a preliminary merge before the upcoming merge of generic parser
branch.