diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 00:48:19 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 00:48:19 +0100 |
| commit | 01da47059ab54544a508b217598fb0e73b73e7a8 (patch) | |
| tree | ccedb10f7d966361e569a3249a1db7209d6faba5 /security/Makefile | |
| parent | Merge branch 'for-linus' of git://git.o-hand.com/linux-rpurdie-backlight (diff) | |
| parent | Merge branch 'fix/hda' into for-linus (diff) | |
| download | linux-01da47059ab54544a508b217598fb0e73b73e7a8.tar.xz linux-01da47059ab54544a508b217598fb0e73b73e7a8.zip | |
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:
sound: sequencer: clean up remove bogus check
ALSA: hda: Use LPIB and 6stack-dig for eMachines T5212
ALSA: hda - Disable MSI for Nvidia controller
ALSA: hda - Add PCI quirks for MSI NetOn AP1900 and Wind Top AE2220
ALSA: hda - Fix secondary ADC of ALC260 basic model
ALSA: hda - Add an error message for invalid mapping NID
ALSA: hda - New Intel HDA controller
Diffstat (limited to 'security/Makefile')
0 files changed, 0 insertions, 0 deletions