Merge branch 'topic/misc' into for-linus
authorTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:57 +0000 (15:32 +0200)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Sep 2009 13:32:57 +0000 (15:32 +0200)
commit9cd9f4276766e15be40d09f77e28656797a1b06f
tree970770f66b6d2e0e444b6ea6f39491c1b1e1a158
parent0f23c5cc50550f194e71e694f2b4433356dd99ea
parentb8c60ede6abf8e96a892c114131700b0cfb0be89
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