Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Thu, 8 Nov 2012 14:58:25 +0000 (15:58 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 8 Nov 2012 14:58:25 +0000 (15:58 +0100)

Trivial merge