Merge branch 'for-linus' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 18 Mar 2013 10:04:42 +0000 (11:04 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 18 Mar 2013 10:04:42 +0000 (11:04 +0100)
Back-merged for refactoring beep stuff.


Trivial merge