Merge branch 'topic/oxygen' into for-next
authorTakashi Iwai <tiwai@suse.de>
Wed, 30 Sep 2009 06:16:57 +0000 (08:16 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 30 Sep 2009 06:16:57 +0000 (08:16 +0200)

Trivial merge