From: Takashi Iwai Date: Fri, 12 Jun 2009 18:03:16 +0000 (+0200) Subject: Merge branch 'topic/ps3' into for-linus X-Git-Tag: v2.6.31-rc1~363^2 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e3f86d3d3ce350144562d9bd035dc8a274fce58e;p=linux.git Merge branch 'topic/ps3' into for-linus * topic/ps3: ALSA: sound/ps3: Correct existing and add missing annotations ALSA: sound/ps3: Restructure driver source ALSA: sound/ps3: Fix checkpatch issues --- e3f86d3d3ce350144562d9bd035dc8a274fce58e