Merge branch 'topic/lola' into for-next
authorTakashi Iwai <tiwai@suse.de>
Tue, 3 May 2011 15:11:58 +0000 (17:11 +0200)
committerTakashi Iwai <tiwai@suse.de>
Tue, 3 May 2011 15:11:58 +0000 (17:11 +0200)

Trivial merge