tree 08470935de327cb438cc9ec738b0e025c3c0b556
parent 2efa1d59fe5af81456393472121623c9502548ce
parent 947d299686aa9cc8aecf749d54e8475c6e498956
author Takashi Iwai <tiwai@suse.de> 1353615759 +0100
committer Takashi Iwai <tiwai@suse.de> 1353615759 +0100

Merge branch 'for-linus' into for-next