commit | 25a025863e024f6b86b48137b10b4960c50351b0 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 09:38:52 2008 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Apr 29 09:38:52 2008 -0700 |
tree | 72d2521585f61d904769d28cf1d7687b949a61a6 | |
parent | 1f43c5393033de90bac4410352b1d2a69dcbe7ef [diff] | |
parent | 7e48bf653c37eb32c2ba4c13f15aa154aa807e61 [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] soc - wm9712 - checkpatch fixes [ALSA] pcsp - Fix more dependency [ALSA] hda - Add support of Medion RIM 2150 [ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors [ALSA] ice1724 - Enable watermarks [ALSA] Add MPU401_INFO_NO_ACK bitflag