Merge branch 'topic/lola' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 4 May 2011 17:55:37 +0000 (19:55 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 4 May 2011 17:55:37 +0000 (19:55 +0200)

Trivial merge