diff options
| author | Takashi Iwai <tiwai@suse.de> | 2008-10-30 14:26:24 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2008-10-30 14:26:24 +0100 |
| commit | 71c21b4cf62177a9d1ea46ff4c6073c907122226 (patch) | |
| tree | 166c5f49d3a6aff481c31081bb59e4fefce37ff1 | |
| parent | 0552f297951d0ab3a1027f9b06fa40c9be8378ba (diff) | |
| parent | 8cd2b264d92bb949ddccfb6db6a82254bb07af75 (diff) | |
| parent | 13d622b33dfbd99205a7add5751ba47445e480a6 (diff) | |
Merge branches 'topic/fix/misc' and 'topic/fix/asoc' into for-linus