| commit | e1f38e2cea199ef2b8e117506fef8abbecbaae5e | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 10 09:34:15 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jun 10 09:34:15 2010 -0700 |
| tree | de5156ac95281c229e2ec142d8b4dee18e399801 | |
| parent | 85ca7886f566ae387a57a37bc0ffab25e3e117b5 [diff] | |
| parent | 2d0a1dbf5715e97e68d33ca5a21a3353c7811215 [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: sound/spi: patch for the unuseful variable removal ALSA: hda - Add SSID table for iMac7,1. ALSA: hda - Add SSID table for MacBookAir1,1 ALSA: hda - Add SSID table for MacBookAir2,1 ALSA: atmel: set "channel A event" output to debug