Merge branch 'topic/uapi-fix' into for-next
authorTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2015 08:14:03 +0000 (09:14 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Feb 2015 08:14:03 +0000 (09:14 +0100)
1  2 
include/uapi/sound/asound.h

Simple merge