Merge branch 'topic/isa' into topic/misc
Takashi Iwai [Wed, 18 Aug 2010 13:17:30 +0000 (15:17 +0200)]
1  2 
sound/usb/pcm.c

diff --cc sound/usb/pcm.c
Simple merge