Merge branch 'topic/lola' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 3 May 2011 16:48:59 +0000 (18:48 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 3 May 2011 16:48:59 +0000 (18:48 +0200)

Trivial merge