diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 13:45:20 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-08-26 13:45:20 -0400 |
| commit | 1941246dd98089dd637f44d3bd4f6cc1c61aa9e4 (patch) | |
| tree | 45dcac88d48607391a4692dc316c91ccb86e2fe9 /block/scsi_ioctl.c | |
| 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
Diffstat (limited to 'block/scsi_ioctl.c')
0 files changed, 0 insertions, 0 deletions