diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:42:55 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:42:55 -0700 |
| commit | eb81071584bed0b04adcaf57e525638d0f92e1e1 (patch) | |
| tree | efd7f5a56299acf9ce96870a7e6e0d353330bdce /crypto/proc.c | |
| parent | 5f4f0c4d3fc95cb7d509e4469a22aed40532f0fc (diff) | |
| parent | bfd4e66b8d0dfcdbe3f5ccff45757f098bdbb26e (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: aoa i2sbus: don't overwrite module parameter
ALSA: ASoC: tlv320aic3x: Fix DSP DAI format and signal polarities matching
ALSA: ASoC: OMAP: Continue fixing DSP DAI format in McBSP DAI driver
ALSA: Ensure PXA runtime data is initialised
ALSA: hda - correct bracketing in spdif test in patch_sigmatel.c
ALSA: hda - Fix conflicting volume controls on ALC260
Diffstat (limited to 'crypto/proc.c')
0 files changed, 0 insertions, 0 deletions