commit | 1941246dd98089dd637f44d3bd4f6cc1c61aa9e4 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 26 10:45:20 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Aug 26 10:45:20 2008 -0700 |
tree | 45dcac88d48607391a4692dc316c91ccb86e2fe9 | |
parent | 1ef708ea449e5eab2780020ec79485db80937833 [diff] | |
parent | e784539fe81490a982a013621d39a60c4fce427e [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6: ALSA: ASoC: Fix error paths in N810 machine driver init and release clocks at exit ALSA: oxygen: prevent muting of nonexistent AC97 controls