tree 075f76a814023b24be73e78ffa1f7a70433ffb89
parent 3374cd1abd478f767aaedf2c21d109596ff0fe72
parent 55c63bd256d41d79adbe1c3fc2325fb328419a18
author Takashi Iwai <tiwai@suse.de> 1274349549 +0200
committer Takashi Iwai <tiwai@suse.de> 1274349549 +0200

Merge branch 'topic/nomm' into for-linus