tree 970770f66b6d2e0e444b6ea6f39491c1b1e1a158
parent 0f23c5cc50550f194e71e694f2b4433356dd99ea
parent b8c60ede6abf8e96a892c114131700b0cfb0be89
author Takashi Iwai <tiwai@suse.de> 1252589577 +0200
committer Takashi Iwai <tiwai@suse.de> 1252589577 +0200

Merge branch 'topic/misc' into for-linus

* topic/misc:
  ALSA: Remove unneeded ifdef from sound/core.h
  ALSA: Remove struct snd_monitor_file from public sound/core.h
  ALSA: Release v1.0.21