tree 993c8a2bd09bbc7c7e76e25d578972e16489db3d
parent ebfe1068f9ca4d0f25beca7a65d652380c40f226
parent a4461f41b94cb52e0141af717dcf4ef6558c8e2e
author Takashi Iwai <tiwai@suse.de> 1383556202 +0100
committer Takashi Iwai <tiwai@suse.de> 1383556202 +0100

Merge branch 'for-linus' into for-next