tree 6d31842f5d8598ea377c09556e455402a06a64fe
parent 056c1ebf1121ca6c16652d0c3fa306622ee338ac
parent 2233123f2776f29d3ac31df1fd1dc40c44d337a5
author Takashi Iwai <tiwai@suse.de> 1244829796 +0200
committer Takashi Iwai <tiwai@suse.de> 1244829796 +0200

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